Skip to contentSkip to conversation

xe/rpls: Add RPLS Support

PATCH In review Anusha Srivatsa 3 participants 6 messages May 22, 2023 – May 23, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 xe/rpls: Add RPLS Support

Add RPLS support that was missing apart from the PCI IDs.

---
 drivers/gpu/drm/xe/xe_pci.c            | 7 +++++++
 drivers/gpu/drm/xe/xe_platform_types.h | 1 +
 2 files changed, 8 insertions(+)
drivers/gpu/drm/xe/xe_pci.c +7 -0
index e789a50a1310..cb748b062e54 100644
@@ -194,6 +194,8 @@ static const struct xe_device_desc rkl_desc = {
 	.require_force_probe = true,
 };
 
+static const u16 adls_rpls_ids[] = { XE_RPLS_IDS(NOP), 0 };
+
 static const struct xe_device_desc adl_s_desc = {
 	.graphics = &graphics_xelp,
 	.media = &media_xem,
@@ -201,6 +203,10 @@ static const struct xe_device_desc adl_s_desc = {
 	.has_display = true,
 	.has_llc = true,
 	.require_force_probe = true,
+	.subplatforms = (const struct xe_subplatform_desc[]) {
+		{ XE_SUBPLATFORM_ADLS_RPLS, "RPLS", adls_rpls_ids },
+		{},
+	},
 };
 
 static const u16 adlp_rplu_ids[] = { XE_RPLU_IDS(NOP), 0 };
@@ -339,6 +345,7 @@ static const struct pci_device_id pciidlist[] = {
 	XE_ADLP_IDS(INTEL_VGA_DEVICE, &adl_p_desc),
 	XE_ADLN_IDS(INTEL_VGA_DEVICE, &adl_n_desc),
 	XE_RPLP_IDS(INTEL_VGA_DEVICE, &adl_p_desc),
+	XE_RPLS_IDS(INTEL_VGA_DEVICE, &adl_s_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),
drivers/gpu/drm/xe/xe_platform_types.h +1 -0
index abbb8a1f29a8..394149838d06 100644
@@ -26,6 +26,7 @@ enum xe_platform {
 enum xe_subplatform {
 	XE_SUBPLATFORM_UNINITIALIZED = 0,
 	XE_SUBPLATFORM_NONE,
+	XE_SUBPLATFORM_ADLS_RPLS,
 	XE_SUBPLATFORM_ADLP_RPLU,
 	XE_SUBPLATFORM_DG2_G10,
 	XE_SUBPLATFORM_DG2_G11,
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/2 xe/rpls: Add Stepping info for RPLS

Add stepping-substepping info.
Though it looks weird, the revision ID
for the newer stepping is indeed backwards
and is in accordance to the spec.

---
 drivers/gpu/drm/xe/xe_step.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/gpu/drm/xe/xe_step.c +8 -0
index a443d9bd7bbb..08c3ccb7d537 100644
@@ -60,6 +60,11 @@ static const struct xe_step_info adls_revids[] = {
 	[0xC] = { COMMON_GT_MEDIA_STEP(D0), .display = STEP_C0 },
 };
 
+static const struct xe_step_info adls_rpls_revids[] = {
+	[0x4] = { COMMON_GT_MEDIA_STEP(D0), .display = STEP_D0 },
+	[0xC] = { COMMON_GT_MEDIA_STEP(D0), .display = STEP_C0 },
+};
+
 static const struct xe_step_info adlp_revids[] = {
 	[0x0] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_A0 },
 	[0x4] = { COMMON_GT_MEDIA_STEP(B0), .display = STEP_B0 },
@@ -136,6 +141,9 @@ struct xe_step_info xe_step_get(struct xe_device *xe)
 	} else if (xe->info.platform == XE_ALDERLAKE_N) {
 		revids = adln_revids;
 		size = ARRAY_SIZE(adln_revids);
+	} else if (xe->info.subplatform == XE_SUBPLATFORM_ADLS_RPLS) {
+		revids = adls_rpls_revids;
+		size = ARRAY_SIZE(adls_rpls_revids);
 	} else if (xe->info.subplatform == XE_SUBPLATFORM_ADLP_RPLU) {
 		revids = adlp_rpl_revids;
 		size = ARRAY_SIZE(adlp_rpl_revids);
Signature · 1 line
2.25.1
Reviewed-by on v1 2/2
#2 lore raw

Re: [Intel-xe] [PATCH 2/2] xe/rpls: Add Stepping info for RPLS

Quoted 4 lines · Anusha Srivatsa

Add stepping-substepping info.
Though it looks weird, the revision ID
for the newer stepping is indeed backwards
and is in accordance to the spec.

You may want to re-wrap this commit message; it's super narrow. Also, the same issue as patch #1 with the subject prefix. Aside from those minor issues,

Quoted 35 lines
---
 drivers/gpu/drm/xe/xe_step.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/gpu/drm/xe/xe_step.c +8 -0
index a443d9bd7bbb..08c3ccb7d537 100644
@@ -60,6 +60,11 @@ static const struct xe_step_info adls_revids[] = {
 	[0xC] = { COMMON_GT_MEDIA_STEP(D0), .display = STEP_C0 },
 };
 
+static const struct xe_step_info adls_rpls_revids[] = {
+	[0x4] = { COMMON_GT_MEDIA_STEP(D0), .display = STEP_D0 },
+	[0xC] = { COMMON_GT_MEDIA_STEP(D0), .display = STEP_C0 },
+};
+
 static const struct xe_step_info adlp_revids[] = {
 	[0x0] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_A0 },
 	[0x4] = { COMMON_GT_MEDIA_STEP(B0), .display = STEP_B0 },
@@ -136,6 +141,9 @@ struct xe_step_info xe_step_get(struct xe_device *xe)
 	} else if (xe->info.platform == XE_ALDERLAKE_N) {
 		revids = adln_revids;
 		size = ARRAY_SIZE(adln_revids);
+	} else if (xe->info.subplatform == XE_SUBPLATFORM_ADLS_RPLS) {
+		revids = adls_rpls_revids;
+		size = ARRAY_SIZE(adls_rpls_revids);
 	} else if (xe->info.subplatform == XE_SUBPLATFORM_ADLP_RPLU) {
 		revids = adlp_rpl_revids;
 		size = ARRAY_SIZE(adlp_rpl_revids);
Signature · 1 line
2.25.1
Signature · 4 lines
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation
#3 lore raw

[Intel-xe] ✓ CI.Patch_applied: success for series starting with [1/2] xe/rpls: Add RPLS Support

In reply to Anusha Srivatsa
== Series Details ==

== Series Details ==

Series: series starting with [1/2] xe/rpls: Add RPLS Support
URL : https://patchwork.freedesktop.org/series/118143/
State : success

== Summary ==

=== Applying kernel patches on branch 'drm-xe-next' with base: === Base commit: 276599734 drm/xe: fix kernel-doc issues === git am output follows ===
Applying: xe/rpls: Add RPLS Support
Applying: xe/rpls: Add Stepping info for RPLS

#4 lore raw

[Intel-xe] ✗ CI.KUnit: failure for series starting with [1/2] xe/rpls: Add RPLS Support

In reply to Anusha Srivatsa
== Series Details ==

== Series Details ==

Series: series starting with [1/2] xe/rpls: Add RPLS Support
URL : https://patchwork.freedesktop.org/series/118143/
State : failure

== Summary ==

+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig
stty: 'standard input': Inappropriate ioctl for device
[19:37:12] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:

$ make ARCH=um O=.kunit olddefconfig
[19:37:16] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make ARCH=um O=.kunit --jobs=48
[19:37:38] Starting KUnit Kernel (1/1)...
[19:37:38] ============================================================
[19:37:38] ==================== xe_bo (2 subtests) ====================
[19:37:38] [SKIPPED] xe_ccs_migrate_kunit
[19:37:38] [SKIPPED] xe_bo_evict_kunit
[19:37:38] ===================== [SKIPPED] xe_bo ======================
[19:37:38] ================== xe_dma_buf (1 subtest) ==================
[19:37:38] [SKIPPED] xe_dma_buf_kunit
[19:37:38] =================== [SKIPPED] xe_dma_buf ===================
[19:37:38] ================== xe_migrate (1 subtest) ==================
[19:37:38] [SKIPPED] xe_migrate_sanity_kunit
[19:37:38] =================== [SKIPPED] xe_migrate ===================
[19:37:38] =================== xe_pci (2 subtests) ====================
[19:37:38] [PASSED] xe_gmdid_graphics_ip
[19:37:38] [PASSED] xe_gmdid_media_ip
[19:37:38] ===================== [PASSED] xe_pci ======================
[19:37:38] ==================== xe_rtp (1 subtest) ====================
[19:37:38] ================== xe_rtp_process_tests  ===================
[19:37:38] [PASSED] coalesce-same-reg
[19:37:38] [PASSED] no-match-no-add
[19:37:38] [PASSED] no-match-no-add-multiple-rules
[19:37:38] [PASSED] two-regs-two-entries
[19:37:38] [PASSED] clr-one-set-other
[19:37:38] [PASSED] set-field
[19:37:38] [PASSED] conflict-duplicate
[19:37:38] [PASSED] conflict-not-disjoint
[19:37:38] [PASSED] conflict-reg-type
[19:37:38] ============== [PASSED] xe_rtp_process_tests ===============
[19:37:38] ===================== [PASSED] xe_rtp ======================
[19:37:38] ==================== xe_wa (1 subtest) =====================
[19:37:38] ======================== xe_wa_gt  =========================
[19:37:38] [PASSED] TIGERLAKE (B0)
[19:37:38] [PASSED] DG1 (A0)
[19:37:38] [PASSED] DG1 (B0)
[19:37:38] # xe_wa_gt: ASSERTION FAILED at drivers/gpu/drm/xe/tests/xe_wa_test.c:86
[19:37:38] Expected ret == 0, but
[19:37:38]     ret == -19 (0xffffffffffffffed)
[19:37:38] [FAILED] ALDERLAKE_S (A0)
[19:37:38] # xe_wa_gt: ASSERTION FAILED at drivers/gpu/drm/xe/tests/xe_wa_test.c:86
[19:37:38] Expected ret == 0, but
[19:37:38]     ret == -19 (0xffffffffffffffed)
[19:37:38] [FAILED] ALDERLAKE_S (B0)
[19:37:38] # xe_wa_gt: ASSERTION FAILED at drivers/gpu/drm/xe/tests/xe_wa_test.c:86
[19:37:38] Expected ret == 0, but
[19:37:38]     ret == -19 (0xffffffffffffffed)
[19:37:38] [FAILED] ALDERLAKE_S (C0)
[19:37:38] # xe_wa_gt: ASSERTION FAILED at drivers/gpu/drm/xe/tests/xe_wa_test.c:86
[19:37:38] Expected ret == 0, but
[19:37:38]     ret == -19 (0xffffffffffffffed)
[19:37:38] [FAILED] ALDERLAKE_S (D0)
[19:37:38] [PASSED] DG2_G10 (A0)
[19:37:38] [PASSED] DG2_G10 (A1)
[19:37:38] [PASSED] DG2_G10 (B0)
[19:37:38] [PASSED] DG2_G10 (C0)
[19:37:38] [PASSED] DG2_G11 (A0)
[19:37:38] [PASSED] DG2_G11 (B0)
[19:37:38] [PASSED] DG2_G11 (B1)
[19:37:38] [PASSED] DG2_G12 (A0)
[19:37:38] [PASSED] DG2_G12 (A1)
[19:37:38] [PASSED] PVC (B0)
[19:37:38] [PASSED] PVC (B1)
[19:37:38] [PASSED] PVC (C0)
[19:37:38] # xe_wa_gt: pass:15 fail:4 skip:0 total:19
[19:37:38] ==================== [FAILED] xe_wa_gt =====================
[19:37:38] # Totals: pass:15 fail:4 skip:0 total:19
[19:37:38] ====================== [FAILED] xe_wa ======================
[19:37:38] ============================================================
[19:37:38] Testing complete. Ran 34 tests: passed: 26, failed: 4, skipped: 4
[19:37:38] Elapsed time: 26.147s total, 4.215s configuring, 21.814s building, 0.097s running

+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel

Reviewed-by on v1 1/2
#5 lore raw
In reply to Anusha Srivatsa
Quoted 3 lines · Anusha Srivatsa

Add RPLS support that was missing apart from the PCI IDs.

The subject prefix is missing the "drm" part. But aside from that,

Quoted 52 lines
---
 drivers/gpu/drm/xe/xe_pci.c            | 7 +++++++
 drivers/gpu/drm/xe/xe_platform_types.h | 1 +
 2 files changed, 8 insertions(+)
drivers/gpu/drm/xe/xe_pci.c +7 -0
index e789a50a1310..cb748b062e54 100644
@@ -194,6 +194,8 @@ static const struct xe_device_desc rkl_desc = {
 	.require_force_probe = true,
 };
 
+static const u16 adls_rpls_ids[] = { XE_RPLS_IDS(NOP), 0 };
+
 static const struct xe_device_desc adl_s_desc = {
 	.graphics = &graphics_xelp,
 	.media = &media_xem,
@@ -201,6 +203,10 @@ static const struct xe_device_desc adl_s_desc = {
 	.has_display = true,
 	.has_llc = true,
 	.require_force_probe = true,
+	.subplatforms = (const struct xe_subplatform_desc[]) {
+		{ XE_SUBPLATFORM_ADLS_RPLS, "RPLS", adls_rpls_ids },
+		{},
+	},
 };
 
 static const u16 adlp_rplu_ids[] = { XE_RPLU_IDS(NOP), 0 };
@@ -339,6 +345,7 @@ static const struct pci_device_id pciidlist[] = {
 	XE_ADLP_IDS(INTEL_VGA_DEVICE, &adl_p_desc),
 	XE_ADLN_IDS(INTEL_VGA_DEVICE, &adl_n_desc),
 	XE_RPLP_IDS(INTEL_VGA_DEVICE, &adl_p_desc),
+	XE_RPLS_IDS(INTEL_VGA_DEVICE, &adl_s_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),
drivers/gpu/drm/xe/xe_platform_types.h +1 -0
index abbb8a1f29a8..394149838d06 100644
@@ -26,6 +26,7 @@ enum xe_platform {
 enum xe_subplatform {
 	XE_SUBPLATFORM_UNINITIALIZED = 0,
 	XE_SUBPLATFORM_NONE,
+	XE_SUBPLATFORM_ADLS_RPLS,
 	XE_SUBPLATFORM_ADLP_RPLU,
 	XE_SUBPLATFORM_DG2_G10,
 	XE_SUBPLATFORM_DG2_G11,
Signature · 1 line
2.25.1
Signature · 4 lines
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation