Skip to contentSkip to conversation

drm/i915/rpl-s: Add stepping info

PATCH In review Anusha Srivatsa 3 participants 5 messages Jan 25, 2022

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

PATCH v2 1/1 drm/i915/rpl-s: Add stepping info

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

v2: Rearrange the platforms in logical order (Matt)

Bspec: 53655

Cc Roper, Matthew D <[email protected]>
---
 drivers/gpu/drm/i915/intel_step.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/gpu/drm/i915/intel_step.c +9 -0
index a4b16b9e2e55..be055eb0b610 100644
@@ -122,6 +122,11 @@ static const struct intel_step_info dg2_g11_revid_step_tbl[] = {
 	[0x5] = { COMMON_GT_MEDIA_STEP(B1), .display_step = STEP_C0 },
 };
 
+static const struct intel_step_info adls_rpls_revids[] = {
+	[0x4] = { COMMON_GT_MEDIA_STEP(D0), .display_step = STEP_D0 },
+	[0xC] = { COMMON_GT_MEDIA_STEP(D0), .display_step = STEP_C0 },
+};
+
 void intel_step_init(struct drm_i915_private *i915)
 {
 	const struct intel_step_info *revids = NULL;
@@ -129,6 +134,7 @@ void intel_step_init(struct drm_i915_private *i915)
 	int revid = INTEL_REVID(i915);
 	struct intel_step_info step = {};
 
+
 	if (IS_DG2_G10(i915)) {
 		revids = dg2_g10_revid_step_tbl;
 		size = ARRAY_SIZE(dg2_g10_revid_step_tbl);
@@ -141,6 +147,9 @@ void intel_step_init(struct drm_i915_private *i915)
 	} else if (IS_ALDERLAKE_P(i915)) {
 		revids = adlp_revids;
 		size = ARRAY_SIZE(adlp_revids);
+	} else if (IS_ADLS_RPLS(i915)) {
+                revids = adls_rpls_revids;
+                size = ARRAY_SIZE(adls_rpls_revids);
 	} else if (IS_ALDERLAKE_S(i915)) {
 		revids = adls_revids;
 		size = ARRAY_SIZE(adls_revids);
Signature · 1 line
2.25.1
#1 lore raw

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/rpl-s: Add stepping info (rev2)

== Series Details ==

== Series Details ==

Series: drm/i915/rpl-s: Add stepping info (rev2)
URL : https://patchwork.freedesktop.org/series/99162/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
ae8b0b24992a drm/i915/rpl-s: Add stepping info
-:38: CHECK:LINE_SPACING: Please don't use multiple blank lines
#38: FILE: drivers/gpu/drm/i915/intel_step.c:137:

+

-:47: ERROR:CODE_INDENT: code indent should use tabs where possible #47: FILE: drivers/gpu/drm/i915/intel_step.c:151:
+ revids = adls_rpls_revids;$

-:47: WARNING:LEADING_SPACE: please, no spaces at the start of a line #47: FILE: drivers/gpu/drm/i915/intel_step.c:151:
+ revids = adls_rpls_revids;$

-:48: ERROR:CODE_INDENT: code indent should use tabs where possible #48: FILE: drivers/gpu/drm/i915/intel_step.c:152:
+ size = ARRAY_SIZE(adls_rpls_revids);$

-:48: WARNING:LEADING_SPACE: please, no spaces at the start of a line #48: FILE: drivers/gpu/drm/i915/intel_step.c:152:
+ size = ARRAY_SIZE(adls_rpls_revids);$

total: 2 errors, 2 warnings, 1 checks, 27 lines checked

Reviewed-by on v2 1/1
#2 lore raw
In reply to Anusha Srivatsa
Quoted 10 lines · Anusha Srivatsa

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

v2: Rearrange the platforms in logical order (Matt)

Bspec: 53655
Cc: Roper, Matthew D <[email protected]>

Git tools like send-email get very confused when they try to parse "Last, First" name ordering. It's best to use "First Last" with no comma to avoid problems.

Quoted 22 lines
---
 drivers/gpu/drm/i915/intel_step.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/gpu/drm/i915/intel_step.c +5 -0
index a4b16b9e2e55..be055eb0b610 100644
@@ -122,6 +122,11 @@ static const struct intel_step_info dg2_g11_revid_step_tbl[] = {
 	[0x5] = { COMMON_GT_MEDIA_STEP(B1), .display_step = STEP_C0 },
 };
 
+static const struct intel_step_info adls_rpls_revids[] = {
+	[0x4] = { COMMON_GT_MEDIA_STEP(D0), .display_step = STEP_D0 },
+	[0xC] = { COMMON_GT_MEDIA_STEP(D0), .display_step = STEP_C0 },
+};
+
 void intel_step_init(struct drm_i915_private *i915)
 {
 	const struct intel_step_info *revids = NULL;

drivers/gpu/drm/i915/intel_step.c void intel_step_init(struct drm_i915_private *i915) · line 137

Quoted 4 lines
drivers/gpu/drm/i915/intel_step.c +1 -0
@@ -129,6 +134,7 @@ void intel_step_init(struct drm_i915_private *i915)
 	int revid = INTEL_REVID(i915);
 	struct intel_step_info step = {};
 
+

Unwanted extra line here, but we can just fix that up (and the cc line above) while applying the patch.

Quoted 16 lines
drivers/gpu/drm/i915/intel_step.c +3 -0
 	if (IS_DG2_G10(i915)) {
 		revids = dg2_g10_revid_step_tbl;
 		size = ARRAY_SIZE(dg2_g10_revid_step_tbl);
@@ -141,6 +147,9 @@ void intel_step_init(struct drm_i915_private *i915)
 	} else if (IS_ALDERLAKE_P(i915)) {
 		revids = adlp_revids;
 		size = ARRAY_SIZE(adlp_revids);
+	} else if (IS_ADLS_RPLS(i915)) {
+                revids = adls_rpls_revids;
+                size = ARRAY_SIZE(adls_rpls_revids);
 	} else if (IS_ALDERLAKE_S(i915)) {
 		revids = adls_revids;
 		size = ARRAY_SIZE(adls_revids);
Signature · 1 line
2.25.1
Signature · 5 lines
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
#3 lore raw
Quoted 15 lines

-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Monday, January 24, 2022 5:06 PM
To: Srivatsa, Anusha <[email protected]>
Cc: [email protected]
Subject: Re: [v2] drm/i915/rpl-s: Add stepping info

Quoted 5 lines · Anusha Srivatsa

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

Quoted 8 lines
Quoted 4 lines

v2: Rearrange the platforms in logical order (Matt)

Bspec: 53655
Cc: Roper, Matthew D <[email protected]>

Git tools like send-email get very confused when they try to parse "Last, First" name ordering. It's best to use "First Last" with no comma to avoid problems.

Yeah, realized it immediately after hitting send :-/

Quoted 26 lines

drivers/gpu/drm/i915/intel_step.c static const struct intel_step_info

Quoted 11 lines
---
 drivers/gpu/drm/i915/intel_step.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/gpu/drm/i915/intel_step.c +0 -0
index a4b16b9e2e55..be055eb0b610 100644
@@ -122,6 +122,11 @@ static const struct intel_step_info

dg2_g11_revid_step_tbl[] = {

drivers/gpu/drm/i915/intel_step.c static const struct intel_step_info dg2_g11_revid_step_tbl[] = { · line 122

Quoted 1 line
drivers/gpu/drm/i915/intel_step.c +0 -0
 	[0x5] = { COMMON_GT_MEDIA_STEP(B1), .display_step = STEP_C0 },

};

drivers/gpu/drm/i915/intel_step.c static const struct intel_step_info dg2_g11_revid_step_tbl[] = { · line 127

Quoted 4 lines
drivers/gpu/drm/i915/intel_step.c +3 -0
+static const struct intel_step_info adls_rpls_revids[] = {
+	[0x4] = { COMMON_GT_MEDIA_STEP(D0), .display_step = STEP_D0 },
+	[0xC] = { COMMON_GT_MEDIA_STEP(D0), .display_step = STEP_C0 },

};

Quoted 7 lines
drivers/gpu/drm/i915/intel_step.c +1 -0
+
 void intel_step_init(struct drm_i915_private *i915)  {
 	const struct intel_step_info *revids = NULL; @@ -129,6 +134,7 @@
 void intel_step_init(struct drm_i915_private *i915)
 	int revid = INTEL_REVID(i915);
 	struct intel_step_info step = {};
Quoted 6 lines

drivers/gpu/drm/i915/intel_step.c static const struct intel_step_info · line 132

Quoted 1 line
drivers/gpu/drm/i915/intel_step.c +1 -0
+

Unwanted extra line here, but we can just fix that up (and the cc line above) while applying the patch.

Thanks!
Anusha

Quoted 23 lines
Quoted 14 lines
drivers/gpu/drm/i915/intel_step.c +3 -1
 	if (IS_DG2_G10(i915)) {
 		revids = dg2_g10_revid_step_tbl;
 		size = ARRAY_SIZE(dg2_g10_revid_step_tbl);
@@ -141,6 +147,9 @@ void intel_step_init(struct drm_i915_private *i915)
 	} else if (IS_ALDERLAKE_P(i915)) {
 		revids = adlp_revids;
 		size = ARRAY_SIZE(adlp_revids);
+	} else if (IS_ADLS_RPLS(i915)) {
+                revids = adls_rpls_revids;
+                size = ARRAY_SIZE(adls_rpls_revids);
 	} else if (IS_ALDERLAKE_S(i915)) {
 		revids = adls_revids;
 		size = ARRAY_SIZE(adls_revids);
--
Quoted 2 lines

2.25.1

--
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795

#4 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/rpl-s: Add stepping info (rev2)

In reply to Anusha Srivatsa
== Series Details ==

== Series Details ==

Series: drm/i915/rpl-s: Add stepping info (rev2)
URL : https://patchwork.freedesktop.org/series/99162/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_11129 -> Patchwork_22091
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22091/index.html

Participating hosts (51 -> 42)
------------------------------

Missing (9): shard-tglu fi-hsw-4200u fi-icl-u2 fi-bsw-cyan fi-ctg-p8600 shard-rkl shard-dg1 bat-jsl-2 fi-bdw-samus

Known issues
------------

Here are the changes found in Patchwork_22091 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_flink_basic@bad-flink:
- fi-skl-6600u: [PASS][1] -> [INCOMPLETE][2] ([i915#4547])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11129/fi-skl-6600u/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22091/fi-skl-6600u/igt@[email protected]

#### Possible fixes ####

* igt@i915_selftest@live@gt_heartbeat:
- {fi-tgl-dsi}: [DMESG-FAIL][3] ([i915#541]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11129/fi-tgl-dsi/igt@i915_selftest@live@gt_heartbeat.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22091/fi-tgl-dsi/igt@i915_selftest@live@gt_heartbeat.html
- fi-bsw-kefka: [DMESG-FAIL][5] ([i915#541]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11129/fi-bsw-kefka/igt@i915_selftest@live@gt_heartbeat.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22091/fi-bsw-kefka/igt@i915_selftest@live@gt_heartbeat.html

* igt@i915_selftest@live@hangcheck:
- bat-dg1-5: [DMESG-FAIL][7] ([i915#4494]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11129/bat-dg1-5/igt@i915_selftest@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22091/bat-dg1-5/igt@i915_selftest@[email protected]

#### Warnings ####

* igt@i915_selftest@live@hangcheck:
- bat-dg1-6: [DMESG-FAIL][9] -> [DMESG-FAIL][10] ([i915#4494] / [i915#4957])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11129/bat-dg1-6/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22091/bat-dg1-6/igt@i915_selftest@[email protected]
- fi-hsw-4770: [INCOMPLETE][11] ([i915#3303]) -> [INCOMPLETE][12] ([i915#4785])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11129/fi-hsw-4770/igt@i915_selftest@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22091/fi-hsw-4770/igt@i915_selftest@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[i915#3303]: https://gitlab.freedesktop.org/drm/intel/issues/3303
[i915#4494]: https://gitlab.freedesktop.org/drm/intel/issues/4494
[i915#4547]: https://gitlab.freedesktop.org/drm/intel/issues/4547
[i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785
[i915#4957]: https://gitlab.freedesktop.org/drm/intel/issues/4957
[i915#541]: https://gitlab.freedesktop.org/drm/intel/issues/541

Build changes
-------------

* Linux: CI_DRM_11129 -> Patchwork_22091

CI-20190529: 20190529
CI_DRM_11129: 0b83d3cf9f9eab03ec804d56ac2686320a64f3ee @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6330: f73008bac9a8db0779264b170f630483e9165764 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22091: ae8b0b24992ae00c8ee4a71e05302f26135912ab @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

ae8b0b24992a drm/i915/rpl-s: Add stepping info

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22091/index.html