Skip to contentSkip to conversation

drm/i915/psr: remove useless enum

PATCH In review Jani Nikula 3 participants 6 messages Jan 4, 2022 – Jan 11, 2022

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

PATCH 1/1 drm/i915/psr: remove useless enum

VBT has a lot of mappings to save bits. Prefer translating them to the actual values while parsing the VBT, keeping the mappings internal to intel_bios.c. Use an int with the correct number of lines to wait instead of keeping the VBT mapping around.

Cc José Roberto de Souza <[email protected]>
Cc Jouni Högander <[email protected]>
Cc Ville Syrjälä <[email protected]>

---

Actually lines_to_wait isn't used at all. Should we nuke it altogether or start using it for something?

---
 drivers/gpu/drm/i915/display/intel_bios.c | 8 ++++----
 drivers/gpu/drm/i915/i915_drv.h           | 9 +--------
 2 files changed, 5 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/display/intel_bios.c +4 -4
index c7a8d517ce81..8d105f44892e 100644
@@ -907,16 +907,16 @@ parse_psr(struct drm_i915_private *i915, const struct bdb_header *bdb)
 
 	switch (psr_table->lines_to_wait) {
 	case 0:
-		i915->vbt.psr.lines_to_wait = PSR_0_LINES_TO_WAIT;
+		i915->vbt.psr.lines_to_wait = 0;
 		break;
 	case 1:
-		i915->vbt.psr.lines_to_wait = PSR_1_LINE_TO_WAIT;
+		i915->vbt.psr.lines_to_wait = 1;
 		break;
 	case 2:
-		i915->vbt.psr.lines_to_wait = PSR_4_LINES_TO_WAIT;
+		i915->vbt.psr.lines_to_wait = 4;
 		break;
 	case 3:
-		i915->vbt.psr.lines_to_wait = PSR_8_LINES_TO_WAIT;
+		i915->vbt.psr.lines_to_wait = 8;
 		break;
 	default:
 		drm_dbg_kms(&i915->drm,
drivers/gpu/drm/i915/i915_drv.h +1 -8
index beeb42a14aae..4d5b239049bb 100644
@@ -515,13 +515,6 @@ i915_fence_timeout(const struct drm_i915_private *i915)
 /* Amount of PSF GV points, BSpec precisely defines this */
 #define I915_NUM_PSF_GV_POINTS 3
 
-enum psr_lines_to_wait {
-	PSR_0_LINES_TO_WAIT = 0,
-	PSR_1_LINE_TO_WAIT,
-	PSR_4_LINES_TO_WAIT,
-	PSR_8_LINES_TO_WAIT
-};
-
 struct intel_vbt_data {
 	/* bdb version */
 	u16 version;
@@ -561,7 +554,7 @@ struct intel_vbt_data {
 		bool full_link;
 		bool require_aux_wakeup;
 		int idle_frames;
-		enum psr_lines_to_wait lines_to_wait;
+		int lines_to_wait;
 		int tp1_wakeup_time_us;
 		int tp2_tp3_wakeup_time_us;
 		int psr2_tp2_tp3_wakeup_time_us;
Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Jani Nikula

VBT has a lot of mappings to save bits. Prefer translating them to the
actual values while parsing the VBT, keeping the mappings internal to intel_bios.c. Use an int with the correct number of lines to wait instead of keeping the VBT mapping around.

Quoted 11 lines
Cc José Roberto de Souza <[email protected]>
Cc Jouni Högander <[email protected]>
Cc Ville Syrjälä <[email protected]>

---

Actually lines_to_wait isn't used at all. Should we nuke it altogether
or start using it for something?

It have been there for quite some time now as unused. Probably no one invents usage for it if removed.

Quoted 53 lines
---
 drivers/gpu/drm/i915/display/intel_bios.c | 8 ++++----
 drivers/gpu/drm/i915/i915_drv.h           | 9 +--------
 2 files changed, 5 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/display/intel_bios.c +4 -4
index c7a8d517ce81..8d105f44892e 100644
@@ -907,16 +907,16 @@ parse_psr(struct drm_i915_private *i915, const
 struct bdb_header *bdb)
 
 	switch (psr_table->lines_to_wait) {
 	case 0:
-		i915->vbt.psr.lines_to_wait = PSR_0_LINES_TO_WAIT;
+		i915->vbt.psr.lines_to_wait = 0;
 		break;
 	case 1:
-		i915->vbt.psr.lines_to_wait = PSR_1_LINE_TO_WAIT;
+		i915->vbt.psr.lines_to_wait = 1;
 		break;
 	case 2:
-		i915->vbt.psr.lines_to_wait = PSR_4_LINES_TO_WAIT;
+		i915->vbt.psr.lines_to_wait = 4;
 		break;
 	case 3:
-		i915->vbt.psr.lines_to_wait = PSR_8_LINES_TO_WAIT;
+		i915->vbt.psr.lines_to_wait = 8;
 		break;
 	default:
drivers/gpu/drm/i915/display/intel_bios.c +0 -0
 		drm_dbg_kms(&i915->drm,
drivers/gpu/drm/i915/i915_drv.h +0 -7
index beeb42a14aae..4d5b239049bb 100644
@@ -515,13 +515,6 @@ i915_fence_timeout(const struct drm_i915_private
 *i915)
 /* Amount of PSF GV points, BSpec precisely defines this */
 #define I915_NUM_PSF_GV_POINTS 3
 
-enum psr_lines_to_wait {
-	PSR_0_LINES_TO_WAIT = 0,
-	PSR_1_LINE_TO_WAIT,
-	PSR_4_LINES_TO_WAIT,
-	PSR_8_LINES_TO_WAIT
-};
-
 struct intel_vbt_data {
 	/* bdb version */
drivers/gpu/drm/i915/i915_drv.h +0 -0
 	u16 version;

drivers/gpu/drm/i915/i915_drv.h struct intel_vbt_data { · line 560

Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -561,7 +554,7 @@ struct intel_vbt_data {
 		bool full_link;
 		bool require_aux_wakeup;
 		int idle_frames;
-		enum psr_lines_to_wait lines_to_wait;
+		int lines_to_wait;
 		int tp1_wakeup_time_us;
 		int tp2_tp3_wakeup_time_us;
 		int psr2_tp2_tp3_wakeup_time_us;

BR,

Jouni Högander

#3 lore raw

[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/psr: remove useless enum

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915/psr: remove useless enum
URL : https://patchwork.freedesktop.org/series/98468/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_11045 -> Patchwork_21913
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_21913 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_21913, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

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

Participating hosts (49 -> 42)
------------------------------

Missing (7): bat-dg1-6 bat-dg1-5 bat-adlp-6 fi-pnv-d510 bat-rpls-1 bat-jsl-2 bat-jsl-1

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_21913:

### IGT changes ###

#### Possible regressions ####

* igt@gem_exec_suspend@basic-s3@smem:
- fi-bdw-samus: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11045/fi-bdw-samus/igt@gem_exec_suspend@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21913/fi-bdw-samus/igt@gem_exec_suspend@[email protected]

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

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

### IGT changes ###

#### Issues hit ####

* igt@amdgpu/amd_cs_nop@sync-fork-compute0:
- fi-kbl-soraka: NOTRUN -> [SKIP][3] ([fdo#109271]) +5 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21913/fi-kbl-soraka/igt@amdgpu/[email protected]

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

* igt@i915_selftest@live@hangcheck:
- fi-hsw-4200u: [PASS][6] -> [DMESG-WARN][7] ([i915#3303])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11045/fi-hsw-4200u/igt@i915_selftest@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21913/fi-hsw-4200u/igt@i915_selftest@[email protected]

#### Warnings ####

* igt@runner@aborted:
- fi-skl-6600u: [FAIL][8] ([i915#4312]) -> [FAIL][9] ([i915#2722] / [i915#4312])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11045/fi-skl-6600u/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21913/fi-skl-6600u/igt@[email protected]

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#3303]: https://gitlab.freedesktop.org/drm/intel/issues/3303
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4547]: https://gitlab.freedesktop.org/drm/intel/issues/4547

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

* Linux: CI_DRM_11045 -> Patchwork_21913

CI-20190529: 20190529
CI_DRM_11045: fe1b95163fc06f02b5a02722801221e7343947ae @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6322: b0b7679b358b300b7b6bf42c6921d0aa1fc14388 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_21913: f473e770ab2d362be52f624005a737111f5fde2e @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

f473e770ab2d drm/i915/psr: remove useless enum

== Logs ==

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

#5 lore raw

[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/psr: remove useless enum (rev2)

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915/psr: remove useless enum (rev2)
URL : https://patchwork.freedesktop.org/series/98468/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_11067 -> Patchwork_21972
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_21972 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_21972, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

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

Participating hosts (45 -> 40)
------------------------------

Missing (5): fi-rkl-guc fi-bsw-cyan bat-adlp-4 fi-pnv-d510 fi-bdw-samus

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_21972:

### IGT changes ###

#### Possible regressions ####

* igt@gem_exec_suspend@basic-s0@smem:
- fi-kbl-soraka: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11067/fi-kbl-soraka/igt@gem_exec_suspend@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21972/fi-kbl-soraka/igt@gem_exec_suspend@[email protected]

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

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

### IGT changes ###

#### Issues hit ####

* igt@amdgpu/amd_basic@semaphore:
- fi-bsw-nick: NOTRUN -> [SKIP][3] ([fdo#109271]) +17 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21972/fi-bsw-nick/igt@amdgpu/[email protected]

* igt@amdgpu/amd_cs_nop@sync-fork-compute0:
- fi-snb-2600: NOTRUN -> [SKIP][4] ([fdo#109271]) +17 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21972/fi-snb-2600/igt@amdgpu/[email protected]

* igt@gem_flink_basic@bad-flink:
- fi-skl-6600u: [PASS][5] -> [FAIL][6] ([i915#4547])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11067/fi-skl-6600u/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21972/fi-skl-6600u/igt@[email protected]

#### Possible fixes ####

* igt@core_hotunplug@unbind-rebind:
- fi-blb-e6850: [FAIL][7] -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11067/fi-blb-e6850/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21972/fi-blb-e6850/igt@[email protected]

* igt@i915_selftest@live@execlists:
- fi-bsw-nick: [INCOMPLETE][9] ([i915#2940]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11067/fi-bsw-nick/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21972/fi-bsw-nick/igt@i915_selftest@[email protected]

* igt@i915_selftest@live@hangcheck:
- fi-snb-2600: [INCOMPLETE][11] ([i915#3921]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11067/fi-snb-2600/igt@i915_selftest@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21972/fi-snb-2600/igt@i915_selftest@[email protected]

* igt@kms_frontbuffer_tracking@basic:
- fi-cml-u2: [DMESG-WARN][13] ([i915#4269]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11067/fi-cml-u2/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21972/fi-cml-u2/igt@[email protected]

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

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[i915#2940]: https://gitlab.freedesktop.org/drm/intel/issues/2940
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3921]: https://gitlab.freedesktop.org/drm/intel/issues/3921
[i915#4269]: https://gitlab.freedesktop.org/drm/intel/issues/4269
[i915#4547]: https://gitlab.freedesktop.org/drm/intel/issues/4547
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533

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

* Linux: CI_DRM_11067 -> Patchwork_21972

CI-20190529: 20190529
CI_DRM_11067: a16208ae0f389bf9ce8bcb9080343eeb08ed7677 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6326: ec75f64fcbcf4aac58fbf1bf629e8f59b19db4ce @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_21972: 7108483aba7e59f009f7612ff9035b8d32658fb2 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

7108483aba7e drm/i915/psr: remove useless enum

== Logs ==

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