From: Shixiong Ou <oushixiong@kylinos.cn>

The is_avivo() function has a logic error where it compares a constant
to another constant instead of checking the device parameter:

  (PCI_VENDOR_ID_ATI_R600 >= 0x9400)

Signed-off-by: Shixiong Ou <oushixiong@kylinos.cn>
---
 drivers/gpu/drm/sysfb/ofdrm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/sysfb/ofdrm.c b/drivers/gpu/drm/sysfb/ofdrm.c
index 819aed466727..1d95df522ad5 100644
--- a/drivers/gpu/drm/sysfb/ofdrm.c
+++ b/drivers/gpu/drm/sysfb/ofdrm.c
@@ -238,7 +238,7 @@ static bool is_avivo(u32 vendor, u32 device)
 	/* This will match most R5xx */
 	return (vendor == PCI_VENDOR_ID_ATI) &&
 	       ((device >= PCI_VENDOR_ID_ATI_R520 && device < 0x7800) ||
-		(PCI_VENDOR_ID_ATI_R600 >= 0x9400));
+		(device >= PCI_VENDOR_ID_ATI_R600));
 }
 
 static enum ofdrm_model display_get_model_of(struct drm_device *dev, struct device_node *of_node)
-- 
2.25.1


No virus found
		Checked by Hillstone Network AntiVirus

Merged into drm-misc-fixes

Am 31.07.26 um 13:17 schrieb oushixiong1025@163.com:
> From: Shixiong Ou <oushixiong@kylinos.cn>
>
> The is_avivo() function has a logic error where it compares a constant
> to another constant instead of checking the device parameter:
>
>    (PCI_VENDOR_ID_ATI_R600 >= 0x9400)
>
> Signed-off-by: Shixiong Ou <oushixiong@kylinos.cn>
> ---
>   drivers/gpu/drm/sysfb/ofdrm.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/sysfb/ofdrm.c b/drivers/gpu/drm/sysfb/ofdrm.c
> index 819aed466727..1d95df522ad5 100644
> --- a/drivers/gpu/drm/sysfb/ofdrm.c
> +++ b/drivers/gpu/drm/sysfb/ofdrm.c
> @@ -238,7 +238,7 @@ static bool is_avivo(u32 vendor, u32 device)
>   	/* This will match most R5xx */
>   	return (vendor == PCI_VENDOR_ID_ATI) &&
>   	       ((device >= PCI_VENDOR_ID_ATI_R520 && device < 0x7800) ||
> -		(PCI_VENDOR_ID_ATI_R600 >= 0x9400));
> +		(device >= PCI_VENDOR_ID_ATI_R600));
>   }
>   
>   static enum ofdrm_model display_get_model_of(struct drm_device *dev, struct device_node *of_node)

-- 
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com
GF: Jochen Jaser, Andrew McDonald, (HRB 36809, AG Nürnberg)

Am 31.07.26 um 13:17 schrieb oushixiong1025@163.com:
> From: Shixiong Ou <oushixiong@kylinos.cn>
>
> The is_avivo() function has a logic error where it compares a constant
> to another constant instead of checking the device parameter:
>
>    (PCI_VENDOR_ID_ATI_R600 >= 0x9400)
>
> Signed-off-by: Shixiong Ou <oushixiong@kylinos.cn>

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>

Fixes: f496834e1674 ("drm/ofdrm: Add per-model device function")
Cc: <stable@vger.kernel.org> # v6.2+


> ---
>   drivers/gpu/drm/sysfb/ofdrm.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/sysfb/ofdrm.c b/drivers/gpu/drm/sysfb/ofdrm.c
> index 819aed466727..1d95df522ad5 100644
> --- a/drivers/gpu/drm/sysfb/ofdrm.c
> +++ b/drivers/gpu/drm/sysfb/ofdrm.c
> @@ -238,7 +238,7 @@ static bool is_avivo(u32 vendor, u32 device)
>   	/* This will match most R5xx */
>   	return (vendor == PCI_VENDOR_ID_ATI) &&
>   	       ((device >= PCI_VENDOR_ID_ATI_R520 && device < 0x7800) ||
> -		(PCI_VENDOR_ID_ATI_R600 >= 0x9400));
> +		(device >= PCI_VENDOR_ID_ATI_R600));
>   }
>   
>   static enum ofdrm_model display_get_model_of(struct drm_device *dev, struct device_node *of_node)

-- 
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com
GF: Jochen Jaser, Andrew McDonald, (HRB 36809, AG Nürnberg)