Skip to contentSkip to conversation

drm/xe: Include RPL-U to pciidlist

PATCH In review José Roberto de Souza 3 participants 6 messages Nov 20, 2023 – Nov 22, 2023 DRM drivers

lore
Share & tools
lore
#0 lore raw

PATCH v2 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.

v2:
- change order to match i915

---
 include/drm/xe_pciids.h | 1 +
 1 file changed, 1 insertion(+)
include/drm/xe_pciids.h +1 -0
index 68fbab161feb0..058a68de3bb57 100644
@@ -117,6 +117,7 @@
 
 /* RPL-P */
 #define XE_RPLP_IDS(MACRO__, ...)		\
+	XE_RPLU_IDS(MACRO__, ## __VA_ARGS__),	\
 	MACRO__(0xA720, ## __VA_ARGS__),	\
 	MACRO__(0xA7A0, ## __VA_ARGS__),	\
 	MACRO__(0xA7A8, ## __VA_ARGS__)
Signature · 1 line
2.42.1
#1 lore raw

PATCH v2 2/2 drm/xe: Add missing RPL and ADL

Those are ids present in i915 but missing in Xe.

---
 include/drm/xe_pciids.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
include/drm/xe_pciids.h +7 -2
index 058a68de3bb57..269622c7ddd0d 100644
@@ -67,6 +67,7 @@
 	MACRO__(0x4682, ## __VA_ARGS__),	\
 	MACRO__(0x4688, ## __VA_ARGS__),	\
 	MACRO__(0x468A, ## __VA_ARGS__),	\
+	MACRO__(0x468B, ## __VA_ARGS__),	\
 	MACRO__(0x4690, ## __VA_ARGS__),	\
 	MACRO__(0x4692, ## __VA_ARGS__),	\
 	MACRO__(0x4693, ## __VA_ARGS__)
@@ -113,14 +114,18 @@
 #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__, ...)		\
 	XE_RPLU_IDS(MACRO__, ## __VA_ARGS__),	\
 	MACRO__(0xA720, ## __VA_ARGS__),	\
 	MACRO__(0xA7A0, ## __VA_ARGS__),	\
-	MACRO__(0xA7A8, ## __VA_ARGS__)
+	MACRO__(0xA7A8, ## __VA_ARGS__),	\
+	MACRO__(0xA7AA, ## __VA_ARGS__),	\
+	MACRO__(0xA7AB, ## __VA_ARGS__)
 
 /* DG2 */
 #define XE_DG2_G10_IDS(MACRO__, ...)		\
Signature · 1 line
2.42.1
Reviewed-by on v2 2/2
#2 lore raw

Re: [Intel-xe] [PATCH v2 2/2] drm/xe: Add missing RPL and ADL

Quoted 4 lines · Jose Souza

Those are ids present in i915 but missing in Xe.

Lucas De Marchi

Quoted 40 lines

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

1 file changed, 7 insertions(+), 2 deletions(-)
include/drm/xe_pciids.h +7 -2
index 058a68de3bb57..269622c7ddd0d 100644
@@ -67,6 +67,7 @@
 	MACRO__(0x4682, ## __VA_ARGS__),	\
 	MACRO__(0x4688, ## __VA_ARGS__),	\
 	MACRO__(0x468A, ## __VA_ARGS__),	\
+	MACRO__(0x468B, ## __VA_ARGS__),	\
 	MACRO__(0x4690, ## __VA_ARGS__),	\
 	MACRO__(0x4692, ## __VA_ARGS__),	\
 	MACRO__(0x4693, ## __VA_ARGS__)
@@ -113,14 +114,18 @@
 #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__, ...)		\
 	XE_RPLU_IDS(MACRO__, ## __VA_ARGS__),	\
 	MACRO__(0xA720, ## __VA_ARGS__),	\
 	MACRO__(0xA7A0, ## __VA_ARGS__),	\
-	MACRO__(0xA7A8, ## __VA_ARGS__)
+	MACRO__(0xA7A8, ## __VA_ARGS__),	\
+	MACRO__(0xA7AA, ## __VA_ARGS__),	\
+	MACRO__(0xA7AB, ## __VA_ARGS__)
 
 /* DG2 */
 #define XE_DG2_G10_IDS(MACRO__, ...)		\
Signature · 1 line
2.42.1
Reviewed-by on v2 1/2
#3 lore raw
In reply to José Roberto de Souza
Quoted 11 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.

v2:
- change order to match i915

thanks
Lucas De Marchi

Quoted 19 lines

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

1 file changed, 1 insertion(+)
include/drm/xe_pciids.h +1 -0
index 68fbab161feb0..058a68de3bb57 100644
@@ -117,6 +117,7 @@
 
 /* RPL-P */
 #define XE_RPLP_IDS(MACRO__, ...)		\
+	XE_RPLU_IDS(MACRO__, ## __VA_ARGS__),	\
 	MACRO__(0xA720, ## __VA_ARGS__),	\
 	MACRO__(0xA7A0, ## __VA_ARGS__),	\
 	MACRO__(0xA7A8, ## __VA_ARGS__)
Signature · 1 line
2.42.1
#4 lore raw

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

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

== Series Details ==

Series: series starting with [v2,1/2] drm/xe: Include RPL-U to pciidlist
URL : https://patchwork.freedesktop.org/series/126668/
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:117
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 [v2,1/2] drm/xe: Include RPL-U to pciidlist

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

== Series Details ==

Series: series starting with [v2,1/2] drm/xe: Include RPL-U to pciidlist
URL : https://patchwork.freedesktop.org/series/126668/
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:117
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".