[PATCH i-g-t 07/10] lib: sync i915_pciids.h with kernel commit 7858cc0b55e3

[Rodrigo Vivi]

On Wed, May 22, 2024 at 01:35:20PM +0300, Jani Nikula wrote:
> Synchronize i915_pciids.h with kernel commit:
> 
> 7858cc0b55e3 ("drm/i915/pciids: remove 12 from INTEL_TGL_IDS()")
> 
> and update the references in intel_device_info.c.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  lib/i915_pciids.h       | 10 +++++-----
>  lib/intel_device_info.c |  4 ++--
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> index ecfd7f71e2e7..42913d2eb655 100644
> --- a/lib/i915_pciids.h
> +++ b/lib/i915_pciids.h
> @@ -620,12 +620,12 @@
>  	INTEL_VGA_DEVICE(0x4E71, info)
>  
>  /* TGL */
> -#define INTEL_TGL_12_GT1_IDS(info) \
> +#define INTEL_TGL_GT1_IDS(info) \
>  	INTEL_VGA_DEVICE(0x9A60, info), \
>  	INTEL_VGA_DEVICE(0x9A68, info), \
>  	INTEL_VGA_DEVICE(0x9A70, info)
>  
> -#define INTEL_TGL_12_GT2_IDS(info) \
> +#define INTEL_TGL_GT2_IDS(info) \
>  	INTEL_VGA_DEVICE(0x9A40, info), \
>  	INTEL_VGA_DEVICE(0x9A49, info), \
>  	INTEL_VGA_DEVICE(0x9A59, info), \
> @@ -635,9 +635,9 @@
>  	INTEL_VGA_DEVICE(0x9AD9, info), \
>  	INTEL_VGA_DEVICE(0x9AF8, info)
>  
> -#define INTEL_TGL_12_IDS(info) \
> -	INTEL_TGL_12_GT1_IDS(info), \
> -	INTEL_TGL_12_GT2_IDS(info)
> +#define INTEL_TGL_IDS(info) \
> +	INTEL_TGL_GT1_IDS(info), \
> +	INTEL_TGL_GT2_IDS(info)
>  
>  /* RKL */
>  #define INTEL_RKL_IDS(info) \
> diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> index 79e3796dbefe..b1eec572dd82 100644
> --- a/lib/intel_device_info.c
> +++ b/lib/intel_device_info.c
> @@ -599,8 +599,8 @@ static const struct pci_id_match intel_device_match[] = {
>  	INTEL_EHL_IDS(&intel_elkhartlake_info),
>  	INTEL_JSL_IDS(&intel_jasperlake_info),
>  
> -	INTEL_TGL_12_GT1_IDS(&intel_tigerlake_gt1_info),
> -	INTEL_TGL_12_GT2_IDS(&intel_tigerlake_gt2_info),
> +	INTEL_TGL_GT1_IDS(&intel_tigerlake_gt1_info),
> +	INTEL_TGL_GT2_IDS(&intel_tigerlake_gt2_info),
>  	INTEL_RKL_IDS(&intel_rocketlake_info),
>  
>  	INTEL_DG1_IDS(&intel_dg1_info),
> -- 
> 2.39.2
>