[Intel-xe] [PATCH] drm/xe: Include RPL sub platform PCI ids to pciidlist

[Lucas De Marchi]

On Fri, Nov 17, 2023 at 09:36:34AM -0800, Jose Souza wrote:
>RPL-U and RPL-S were defined as a subplatform but those PCI ids were
>not included in pciidlist so Xe KMD would never probe device with
>those ids.
>
>Signed-off-by: José Roberto de Souza <jose.souza at intel.com>
>---
> include/drm/xe_pciids.h | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/include/drm/xe_pciids.h b/include/drm/xe_pciids.h
>index 68fbab161feb0..d1e54befd05f4 100644
>--- a/include/drm/xe_pciids.h
>+++ b/include/drm/xe_pciids.h
>@@ -69,7 +69,8 @@
> 	MACRO__(0x468A, ## __VA_ARGS__),	\
> 	MACRO__(0x4690, ## __VA_ARGS__),	\
> 	MACRO__(0x4692, ## __VA_ARGS__),	\
>-	MACRO__(0x4693, ## __VA_ARGS__)
>+	MACRO__(0x4693, ## __VA_ARGS__),	\
>+	XE_RPLS_IDS(MACRO__, ## __VA_ARGS__)

that doesn't seem right... you are adding it to ADL-S list even if that
was not the appraoch taken for i915. For xe1 platforms we should generally
follow whatever was done for i915 instead of deviating from
it, which means:

/* 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)

and then add both RPLP and RPLS to the pciidlist:

static const struct pci_device_id pciidlist[] = {
	...
         INTEL_RPLS_IDS(&adl_s_info),
         INTEL_RPLP_IDS(&adl_p_info),
	...
}

... Even though adding RPLU to the RPLP list is odd. Looking at
drm-xe-next it seems that is the only thing missing, i.e. :

>
> /* ADL-P */
> #define XE_ADLP_IDS(MACRO__, ...)		\
>@@ -119,7 +120,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__)


^ this. And update the list of PCIIDs to match i915.

Although the use of -[USP] in some places and not other may need a patch
to stop it.

Lucas De Marchi

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