[igt-dev] [PATCH 1/1] lib/i915_pciids.h: Add DG2 PCI IDs

[Zbigniew Kempczyński]

On Tue, Mar 08, 2022 at 09:30:06AM +0100, Mauro Carvalho Chehab wrote:
> From: Mauro Carvalho Chehab <mchehab at kernel.org>
> 
> As DG2 hardware will start showing up in CI shortly, and the DG2
> list of PCI id's is not in sync with the patch merged at Linux
> drm-tip upstream, update them to reflect what it was merged
> there by this Linux changeset:
> 
>   commit 92b805135ed2851989097106bbde0f099d664902
>   Author: Matt Roper <matthew.d.roper at intel.com>
>   Date:   Tue Feb 15 13:45:44 2022 -0800
> 
>     drm/i915: Add DG2 PCI IDs
> 
>     DG2 hardware will start showing up in CI shortly; let's make sure it's
>     recognized by the driver.
> 
>     Signed-off-by: Matt Roper <matthew.d.roper at intel.com>
>     Reviewed-by: Caz Yokoyama <caz.yokoyama at intel.com>
>     Link: https://patchwork.freedesktop.org/patch/msgid/20220215214544.2197483-1-matthew.d.roper@intel.com
>     Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> 
> This patch partially reverts:
> b842aa665d48 ("lib/intel_device_info: Introduce i915_pciids_local.h and add DG2 definition")

I would keep this file even if it stays empty. We will need this when
we start upstreaming other gpus. I will add comment on the top of the
file what's intention of it.

--
Zbigniew

> 
> Cc: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>
> Signed-off-by: Mauro Carvalho Chehab <mchehab at kernel.org>
> ---
>  lib/i915_pciids.h       | 27 +++++++++++++++++++++++++++
>  lib/i915_pciids_local.h | 20 --------------------
>  lib/intel_device_info.c |  1 -
>  3 files changed, 27 insertions(+), 21 deletions(-)
>  delete mode 100644 lib/i915_pciids_local.h
> 
> diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> index 533890dc9da1..3609f3254f24 100644
> --- a/lib/i915_pciids.h
> +++ b/lib/i915_pciids.h
> @@ -681,4 +681,31 @@
>  	INTEL_VGA_DEVICE(0xA788, info), \
>  	INTEL_VGA_DEVICE(0xA789, info)
>  
> +/* DG2 */
> +#define INTEL_DG2_G10_IDS(info) \
> +	INTEL_VGA_DEVICE(0x5690, info), \
> +	INTEL_VGA_DEVICE(0x5691, info), \
> +	INTEL_VGA_DEVICE(0x5692, info), \
> +	INTEL_VGA_DEVICE(0x56A0, info), \
> +	INTEL_VGA_DEVICE(0x56A1, info), \
> +	INTEL_VGA_DEVICE(0x56A2, info)
> +
> +#define INTEL_DG2_G11_IDS(info) \
> +	INTEL_VGA_DEVICE(0x5693, info), \
> +	INTEL_VGA_DEVICE(0x5694, info), \
> +	INTEL_VGA_DEVICE(0x5695, info), \
> +	INTEL_VGA_DEVICE(0x56A5, info), \
> +	INTEL_VGA_DEVICE(0x56A6, info), \
> +	INTEL_VGA_DEVICE(0x56B0, info), \
> +	INTEL_VGA_DEVICE(0x56B1, info)
> +
> +#define INTEL_DG2_G12_IDS(info) \
> +	INTEL_VGA_DEVICE(0x56A3, info), \
> +	INTEL_VGA_DEVICE(0x56A4, info)
> +
> +#define INTEL_DG2_IDS(info) \
> +	INTEL_DG2_G10_IDS(info), \
> +	INTEL_DG2_G11_IDS(info), \
> +	INTEL_DG2_G12_IDS(info)
> +
>  #endif /* _I915_PCIIDS_H */
> diff --git a/lib/i915_pciids_local.h b/lib/i915_pciids_local.h
> deleted file mode 100644
> index 2a18109e59e5..000000000000
> --- a/lib/i915_pciids_local.h
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -/* SPDX-License-Identifier: MIT */
> -/*
> - * Copyright © 2022 Intel Corporation
> - */
> -#ifndef _I915_PCIIDS_LOCAL_H_
> -#define _I915_PCIIDS_LOCAL_H_
> -
> -#include "i915_pciids.h"
> -
> -/* DG2 */
> -#define INTEL_DG2_IDS(info) \
> -	INTEL_VGA_DEVICE(0x56A0, info), \
> -	INTEL_VGA_DEVICE(0x56A1, info), \
> -	INTEL_VGA_DEVICE(0x56A2, info), \
> -	INTEL_VGA_DEVICE(0x56A3, info), \
> -	INTEL_VGA_DEVICE(0x56A4, info), \
> -	INTEL_VGA_DEVICE(0x56A5, info), \
> -	INTEL_VGA_DEVICE(0x56A6, info)
> -
> -#endif /* _I915_PCIIDS_LOCAL_H */
> diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> index 9f19136795e4..56c43e97a40f 100644
> --- a/lib/intel_device_info.c
> +++ b/lib/intel_device_info.c
> @@ -1,6 +1,5 @@
>  #include "intel_chipset.h"
>  #include "i915_pciids.h"
> -#include "i915_pciids_local.h"
>  
>  #include <strings.h> /* ffs() */
>  
> -- 
> 2.35.1
>