[Intel-xe] [PATCH] drm/xe: Update the list of devices to add even more TGL devices

[Intel-xe] [PATCH] drm/xe: Update the list of devices to add even more TGL devices

[Carlos Santa]

The list of GTs got splitted a while back between GT1
and GT2 on TGL.

See here: patchwork.freedesktop.org/patch/388414

CC: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Carlos Santa <carlos.santa@intel.com>
---
 drivers/gpu/drm/xe/xe_pci.c | 2 +-
 include/drm/xe_pciids.h     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index 291561a8f5af..b769cd5ba6db 100644
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -354,7 +354,7 @@ static const struct xe_device_desc mtl_desc = {
  * PCI ID matches, otherwise we'll use the wrong info struct above.
  */
 static const struct pci_device_id pciidlist[] = {
-	XE_TGL_GT2_IDS(INTEL_VGA_DEVICE, &tgl_desc),
+	XE_TGL_IDS(INTEL_VGA_DEVICE, &tgl_desc),
 	XE_DG1_IDS(INTEL_VGA_DEVICE, &dg1_desc),
 	XE_ATS_M_IDS(INTEL_VGA_DEVICE, &ats_m_desc),
 	XE_DG2_IDS(INTEL_VGA_DEVICE, &dg2_desc),
diff --git a/include/drm/xe_pciids.h b/include/drm/xe_pciids.h
index a857af1a0b1f..df1b977763be 100644
--- a/include/drm/xe_pciids.h
+++ b/include/drm/xe_pciids.h
@@ -41,8 +41,8 @@
 	MACRO__(0x9AF8, ## __VA_ARGS__)
 
 #define XE_TGL_IDS(MACRO__, ...)		\
-	XE_TGL_GT1_IDS(MACRO__, ...),		\
-	XE_TGL_GT2_IDS(MACRO__, ...)
+	XE_TGL_GT1_IDS(MACRO__, ## __VA_ARGS__),\
+	XE_TGL_GT2_IDS(MACRO__, ## __VA_ARGS__)
 
 /* RKL */
 #define XE_RKL_IDS(MACRO__, ...)		\
-- 
2.25.1

Re: [Intel-xe] [PATCH] drm/xe: Update the list of devices to add even more TGL devices

[Rodrigo Vivi]

On Wed, Feb 15, 2023 at 12:34:25PM -0800, Carlos Santa wrote:
> The list of GTs got splitted a while back between GT1
> and GT2 on TGL.
> 
> See here: patchwork.freedesktop.org/patch/388414

I will change this to:

References: https://patchwork.freedesktop.org/patch/388414/

> 
> CC: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Carlos Santa <carlos.santa@intel.com>

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

and getting this merged right now.
Thanks for the patch.

> ---
>  drivers/gpu/drm/xe/xe_pci.c | 2 +-
>  include/drm/xe_pciids.h     | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
> index 291561a8f5af..b769cd5ba6db 100644
> --- a/drivers/gpu/drm/xe/xe_pci.c
> +++ b/drivers/gpu/drm/xe/xe_pci.c
> @@ -354,7 +354,7 @@ static const struct xe_device_desc mtl_desc = {
>   * PCI ID matches, otherwise we'll use the wrong info struct above.
>   */
>  static const struct pci_device_id pciidlist[] = {
> -	XE_TGL_GT2_IDS(INTEL_VGA_DEVICE, &tgl_desc),
> +	XE_TGL_IDS(INTEL_VGA_DEVICE, &tgl_desc),
>  	XE_DG1_IDS(INTEL_VGA_DEVICE, &dg1_desc),
>  	XE_ATS_M_IDS(INTEL_VGA_DEVICE, &ats_m_desc),
>  	XE_DG2_IDS(INTEL_VGA_DEVICE, &dg2_desc),
> diff --git a/include/drm/xe_pciids.h b/include/drm/xe_pciids.h
> index a857af1a0b1f..df1b977763be 100644
> --- a/include/drm/xe_pciids.h
> +++ b/include/drm/xe_pciids.h
> @@ -41,8 +41,8 @@
>  	MACRO__(0x9AF8, ## __VA_ARGS__)
>  
>  #define XE_TGL_IDS(MACRO__, ...)		\
> -	XE_TGL_GT1_IDS(MACRO__, ...),		\
> -	XE_TGL_GT2_IDS(MACRO__, ...)
> +	XE_TGL_GT1_IDS(MACRO__, ## __VA_ARGS__),\
> +	XE_TGL_GT2_IDS(MACRO__, ## __VA_ARGS__)
>  
>  /* RKL */
>  #define XE_RKL_IDS(MACRO__, ...)		\
> -- 
> 2.25.1
>