Skip to contentSkip to conversation

drm/xe: Include RPL-U to pciidlist

PATCH Superseded José Roberto de Souza 3 participants 7 messages Nov 20, 2023 – Nov 22, 2023 DRM drivers

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

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

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.

---
 include/drm/xe_pciids.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
include/drm/xe_pciids.h +2 -1
index 68fbab161feb0..574a17c022490 100644
@@ -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__)
 
 /* DG2 */
 #define XE_DG2_G10_IDS(MACRO__, ...)		\
Signature · 1 line
2.42.1
#1 lore raw

PATCH 2/2 drm/xe: Add missing RPL-P and RPL-U PCI ids

Those are ids present in i915 but missing in i915 for RPL.

---
 include/drm/xe_pciids.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
include/drm/xe_pciids.h +5 -1
index 574a17c022490..6f19816ecd240 100644
@@ -113,13 +113,17 @@
 #define XE_RPLU_IDS(MACRO__, ...)		\
 	MACRO__(0xA721, ## __VA_ARGS__),	\
 	MACRO__(0xA7A1, ## __VA_ARGS__),	\
-	MACRO__(0xA7A9, ## __VA_ARGS__)
+	MACRO__(0xA7A9, ## __VA_ARGS__),	\
+	MACRO__(0xA7AC, ## __VA_ARGS__),	\
+	MACRO__(0xA7AD, ## __VA_ARGS__)
 
 /* RPL-P */
 #define XE_RPLP_IDS(MACRO__, ...)		\
 	MACRO__(0xA720, ## __VA_ARGS__),	\
 	MACRO__(0xA7A0, ## __VA_ARGS__),	\
 	MACRO__(0xA7A8, ## __VA_ARGS__),	\
+	MACRO__(0xA7AA, ## __VA_ARGS__),	\
+	MACRO__(0xA7AB, ## __VA_ARGS__),	\
 	XE_RPLU_IDS(MACRO__, ## __VA_ARGS__)
 
 /* DG2 */
Signature · 1 line
2.42.1
#2 lore raw
In reply to José Roberto de Souza
Quoted 17 lines · Jose Souza

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.

---
include/drm/xe_pciids.h | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)
include/drm/xe_pciids.h +0 -0
index 68fbab161feb0..574a17c022490 100644

include/drm/xe_pciids.h line 123

Quoted 6 lines
include/drm/xe_pciids.h +2 -1
@@ -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

Quoted 6 lines
include/drm/xe_pciids.h +0 -0
 /* DG2 */
 #define XE_DG2_G10_IDS(MACRO__, ...)		\
Signature · 1 line
2.42.1
#3 lore raw
Quoted 54 lines · Lucas De Marchi
Quoted 17 lines · Jose Souza

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.

---
include/drm/xe_pciids.h | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)
include/drm/xe_pciids.h +0 -0
index 68fbab161feb0..574a17c022490 100644

include/drm/xe_pciids.h line 123

Quoted 6 lines
include/drm/xe_pciids.h +2 -1
@@ -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__+})
Quoted 4 lines

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.

Got it now, will fix order and add the missing ADL-S id.

There is diffs in MTL ids between i915 and Xe that I will leave for someone else to fix.

Quoted 9 lines

Lucas De Marchi

Quoted 6 lines
include/drm/xe_pciids.h +0 -0
 /* DG2 */
 #define XE_DG2_G10_IDS(MACRO__, ...)		\
Signature · 1 line
2.42.1
#4 lore raw

[Intel-xe] ✗ CI.Patch_applied: failure for series starting with [1/2] drm/xe: Include RPL-U to pciidlist

In reply to José Roberto de Souza
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/xe: Include RPL-U to pciidlist
URL : https://patchwork.freedesktop.org/series/126663/
State : failure

== Summary ==

=== Applying kernel patches on branch 'drm-xe-next' with base: === Base commit: 723ff01a3 drm/xe: ATS-M device ID update
=== git am output follows ===
error: patch failed: include/drm/xe_pciids.h:119
error: include/drm/xe_pciids.h: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: drm/xe: Include RPL-U to pciidlist
Patch failed at 0001 drm/xe: Include RPL-U to pciidlist
When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".

#5 lore raw

[Intel-xe] ✗ CI.Patch_applied: failure for series starting with [1/2] drm/xe: Include RPL-U to pciidlist (rev2)

In reply to José Roberto de Souza
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/xe: Include RPL-U to pciidlist (rev2)
URL : https://patchwork.freedesktop.org/series/126663/
State : failure

== Summary ==

=== Applying kernel patches on branch 'drm-xe-next' with base: ===
Base commit: 89e2bb1e1 fixup! drm/xe: Moving and renaming existing frequency sysfs attributes === git am output follows ===
error: patch failed: include/drm/xe_pciids.h:119
error: include/drm/xe_pciids.h: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: drm/xe: Include RPL-U to pciidlist
Patch failed at 0001 drm/xe: Include RPL-U to pciidlist
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

#6 lore raw

[Intel-xe] ✗ CI.Patch_applied: failure for series starting with [1/2] drm/xe: Include RPL-U to pciidlist

In reply to José Roberto de Souza
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/xe: Include RPL-U to pciidlist
URL : https://patchwork.freedesktop.org/series/126663/
State : failure

== Summary ==

=== Applying kernel patches on branch 'drm-xe-next' with base: ===
Base commit: 89e2bb1e1 fixup! drm/xe: Moving and renaming existing frequency sysfs attributes === git am output follows ===
error: patch failed: include/drm/xe_pciids.h:119
error: include/drm/xe_pciids.h: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: drm/xe: Include RPL-U to pciidlist
Patch failed at 0001 drm/xe: Include RPL-U to pciidlist
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".