[PATCH 7/8] drm/i915/pciids: remove 12 from INTEL_TGL_IDS()

[Rodrigo Vivi]

On Fri, May 10, 2024 at 02:22:20PM +0300, Jani Nikula wrote:
> Most other PCI ID macros do not encode the gen in the name. Follow suit
> for TGL.

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

> 
> Cc: Bjorn Helgaas <bhelgaas at google.com>
> Cc: linux-pci at vger.kernel.org
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  arch/x86/kernel/early-quirks.c                      |  2 +-
>  drivers/gpu/drm/i915/display/intel_display_device.c |  2 +-
>  drivers/gpu/drm/i915/i915_pci.c                     |  2 +-
>  drivers/gpu/drm/i915/intel_device_info.c            |  2 +-
>  include/drm/i915_pciids.h                           | 10 +++++-----
>  5 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> index c150bb6f1a39..b2b9cc3b9545 100644
> --- a/arch/x86/kernel/early-quirks.c
> +++ b/arch/x86/kernel/early-quirks.c
> @@ -550,7 +550,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {
>  	INTEL_ICL_IDS(&gen11_early_ops),
>  	INTEL_EHL_IDS(&gen11_early_ops),
>  	INTEL_JSL_IDS(&gen11_early_ops),
> -	INTEL_TGL_12_IDS(&gen11_early_ops),
> +	INTEL_TGL_IDS(&gen11_early_ops),
>  	INTEL_RKL_IDS(&gen11_early_ops),
>  	INTEL_ADLS_IDS(&gen11_early_ops),
>  	INTEL_ADLP_IDS(&gen11_early_ops),
> diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
> index e47896002c13..fb4c4054207e 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_device.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_device.c
> @@ -834,7 +834,7 @@ static const struct {
>  	INTEL_ICL_IDS(&icl_display),
>  	INTEL_EHL_IDS(&jsl_ehl_display),
>  	INTEL_JSL_IDS(&jsl_ehl_display),
> -	INTEL_TGL_12_IDS(&tgl_display),
> +	INTEL_TGL_IDS(&tgl_display),
>  	INTEL_DG1_IDS(&dg1_display),
>  	INTEL_RKL_IDS(&rkl_display),
>  	INTEL_ADLS_IDS(&adl_s_display),
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index 06b1d50ae47c..fa56113ed1ce 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -860,7 +860,7 @@ static const struct pci_device_id pciidlist[] = {
>  	INTEL_ICL_IDS(&icl_info),
>  	INTEL_EHL_IDS(&ehl_info),
>  	INTEL_JSL_IDS(&jsl_info),
> -	INTEL_TGL_12_IDS(&tgl_info),
> +	INTEL_TGL_IDS(&tgl_info),
>  	INTEL_RKL_IDS(&rkl_info),
>  	INTEL_ADLS_IDS(&adl_s_info),
>  	INTEL_ADLP_IDS(&adl_p_info),
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
> index a0a43ea07f11..64651a54a245 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -173,7 +173,7 @@ static const u16 subplatform_portf_ids[] = {
>  };
>  
>  static const u16 subplatform_uy_ids[] = {
> -	INTEL_TGL_12_GT2_IDS(0),
> +	INTEL_TGL_GT2_IDS(0),
>  };
>  
>  static const u16 subplatform_n_ids[] = {
> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> index ecfd7f71e2e7..42913d2eb655 100644
> --- a/include/drm/i915_pciids.h
> +++ b/include/drm/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) \
> -- 
> 2.39.2
>