[PATCH 4/8] drm/i915/pciids: add INTEL_IVB_IDS()

[Rodrigo Vivi]

On Fri, May 10, 2024 at 02:22:17PM +0300, Jani Nikula wrote:
> Add INTEL_IVB_IDS() to identify all IVBs except IVB Q transcode.
> 

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                      | 3 +--
>  drivers/gpu/drm/i915/display/intel_display_device.c | 3 +--
>  include/drm/i915_pciids.h                           | 4 ++++
>  3 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> index 23ded9260302..6549507003ec 100644
> --- a/arch/x86/kernel/early-quirks.c
> +++ b/arch/x86/kernel/early-quirks.c
> @@ -535,8 +535,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {
>  	INTEL_G45_IDS(&gen3_early_ops),
>  	INTEL_ILK_IDS(&gen3_early_ops),
>  	INTEL_SNB_IDS(&gen6_early_ops),
> -	INTEL_IVB_M_IDS(&gen6_early_ops),
> -	INTEL_IVB_D_IDS(&gen6_early_ops),
> +	INTEL_IVB_IDS(&gen6_early_ops),
>  	INTEL_HSW_IDS(&gen6_early_ops),
>  	INTEL_BDW_IDS(&gen8_early_ops),
>  	INTEL_CHV_IDS(&chv_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 c40d12ca386a..bb681c8ed8a0 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_device.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_device.c
> @@ -819,8 +819,7 @@ static const struct {
>  	INTEL_ILK_D_IDS(&ilk_d_display),
>  	INTEL_ILK_M_IDS(&ilk_m_display),
>  	INTEL_SNB_IDS(&snb_display),
> -	INTEL_IVB_M_IDS(&ivb_display),
> -	INTEL_IVB_D_IDS(&ivb_display),
> +	INTEL_IVB_IDS(&ivb_display),
>  	INTEL_HSW_IDS(&hsw_display),
>  	INTEL_VLV_IDS(&vlv_display),
>  	INTEL_BDW_IDS(&bdw_display),
> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> index 0d48c493dcce..16778d92346b 100644
> --- a/include/drm/i915_pciids.h
> +++ b/include/drm/i915_pciids.h
> @@ -177,6 +177,10 @@
>  	INTEL_IVB_D_GT1_IDS(info), \
>  	INTEL_IVB_D_GT2_IDS(info)
>  
> +#define INTEL_IVB_IDS(info) \
> +	INTEL_IVB_M_IDS(info), \
> +	INTEL_IVB_D_IDS(info)
> +
>  #define INTEL_IVB_Q_IDS(info) \
>  	INTEL_QUANTA_VGA_DEVICE(info) /* Quanta transcode */
>  
> -- 
> 2.39.2
>