[PATCH i-g-t 02/10] lib: sync i915_pciids.h with kernel commit 41c0f8a36f15

[Rodrigo Vivi]

On Wed, May 22, 2024 at 01:35:15PM +0300, Jani Nikula wrote:
> Synchronize i915_pciids.h with kernel commit:
> 
> 41c0f8a36f15 ("drm/i915/pciids: add INTEL_ILK_IDS(), use acronym")
> 
> 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       | 8 ++++++--
>  lib/intel_device_info.c | 4 ++--
>  2 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> index 21942a3c823b..05f466ca8ce2 100644
> --- a/lib/i915_pciids.h
> +++ b/lib/i915_pciids.h
> @@ -118,12 +118,16 @@
>  	INTEL_PNV_G_IDS(info), \
>  	INTEL_PNV_M_IDS(info)
>  
> -#define INTEL_IRONLAKE_D_IDS(info) \
> +#define INTEL_ILK_D_IDS(info) \
>  	INTEL_VGA_DEVICE(0x0042, info)
>  
> -#define INTEL_IRONLAKE_M_IDS(info) \
> +#define INTEL_ILK_M_IDS(info) \
>  	INTEL_VGA_DEVICE(0x0046, info)
>  
> +#define INTEL_ILK_IDS(info) \
> +	INTEL_ILK_D_IDS(info), \
> +	INTEL_ILK_M_IDS(info)
> +
>  #define INTEL_SNB_D_GT1_IDS(info) \
>  	INTEL_VGA_DEVICE(0x0102, info), \
>  	INTEL_VGA_DEVICE(0x010A, info)
> diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> index 88b160ae2d69..0bff1ab4ee95 100644
> --- a/lib/intel_device_info.c
> +++ b/lib/intel_device_info.c
> @@ -539,8 +539,8 @@ static const struct pci_id_match intel_device_match[] = {
>  	INTEL_G45_IDS(&intel_g45_info),
>  	INTEL_GM45_IDS(&intel_gm45_info),
>  
> -	INTEL_IRONLAKE_D_IDS(&intel_ironlake_info),
> -	INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),
> +	INTEL_ILK_D_IDS(&intel_ironlake_info),
> +	INTEL_ILK_M_IDS(&intel_ironlake_m_info),
>  
>  	INTEL_SNB_D_IDS(&intel_sandybridge_info),
>  	INTEL_SNB_M_IDS(&intel_sandybridge_m_info),
> -- 
> 2.39.2
>