[Intel-xe] [PATCH 1/2] drm/xe: Include RPL-U to pciidlist

[Lucas De Marchi]

On Mon, Nov 20, 2023 at 10:07:16AM -0800, Jose Souza wrote:
>RPL-U is defined as a subplatform but those PCI ids were
>not included in pciidlist so Xe KMD would never probe device with
>those ids.
>This is following what i915 does to include RPL-U to PCI ids
>probe list.
>
>Cc: Lucas De Marchi <lucas.demarchi at intel.com>
>Signed-off-by: José Roberto de Souza <jose.souza at intel.com>
>---
> include/drm/xe_pciids.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/include/drm/xe_pciids.h b/include/drm/xe_pciids.h
>index 68fbab161feb0..574a17c022490 100644
>--- a/include/drm/xe_pciids.h
>+++ b/include/drm/xe_pciids.h
>@@ -119,7 +119,8 @@
> #define XE_RPLP_IDS(MACRO__, ...)		\
> 	MACRO__(0xA720, ## __VA_ARGS__),	\
> 	MACRO__(0xA7A0, ## __VA_ARGS__),	\
>-	MACRO__(0xA7A8, ## __VA_ARGS__)
>+	MACRO__(0xA7A8, ## __VA_ARGS__),	\
>+	XE_RPLU_IDS(MACRO__, ## __VA_ARGS__)

no, i915 has this:

/* RPL-P */
#define INTEL_RPLP_IDS(info) \
         INTEL_RPLU_IDS(info), \
         INTEL_VGA_DEVICE(0xA720, info), \
         INTEL_VGA_DEVICE(0xA7A0, info), \
         INTEL_VGA_DEVICE(0xA7A8, info), \
         INTEL_VGA_DEVICE(0xA7AA, info), \
         INTEL_VGA_DEVICE(0xA7AB, info)

What I want is to be able to do

	git diff --word-diff --no-index include/drm/{i915,xe}_pciids.h

to see what is different. For example, we can clearly see we are missing
one pciid of ADL-S:

/* ADL-S */
#define [-INTEL_ADLS_IDS-]{+XE_ADLS_IDS+}([-info-]{+MACRO__, ...+})             \
         [-INTEL_VGA_DEVICE-]{+MACRO__+}(0x4680, [-info-]{+## __VA_ARGS__+}),    \
         [-INTEL_VGA_DEVICE-]{+MACRO__+}(0x4682, [-info-]{+## __VA_ARGS__+}),    \
         [-INTEL_VGA_DEVICE-]{+MACRO__+}(0x4688, [-info-]{+## __VA_ARGS__+}),    \
         [-INTEL_VGA_DEVICE-]{+MACRO__+}(0x468A, [-info), \-]
[-      INTEL_VGA_DEVICE(0x468B, info-]{+## __VA_ARGS__+}),     \
         [-INTEL_VGA_DEVICE-]{+MACRO__+}(0x4690, [-info-]{+## __VA_ARGS__+}),    \
         [-INTEL_VGA_DEVICE-]{+MACRO__+}(0x4692, [-info-]{+## __VA_ARGS__+}),    \
         [-INTEL_VGA_DEVICE-]{+MACRO__+}(0x4693, [-info-]{+## __VA_ARGS__+})

and that RPL-[UP] is the mess you're trying to fix.
The diff for DG2 is because we didn't cherry-pick
d0c908d2978e0ef3c1ac1357c1c58224a153f8d4 as it's
not really needed.

Lucas De Marchi

>
> /* DG2 */
> #define XE_DG2_G10_IDS(MACRO__, ...)		\
>-- 
>2.42.1
>