Skip to contentSkip to conversation

drm/i915/display: Use initial_fastset_check() to compute and apply the initial PSR state

PATCH In review José Roberto de Souza 3 participants 5 messages Nov 2, 2020 – Nov 5, 2020

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

PATCH 1/1 drm/i915/display: Use initial_fastset_check() to compute and apply the initial PSR state

Replace the previous approach to force compute the initial PSR state after i915 take over from firmware by the better and recently added initial_fastset_check() hook.

---
 drivers/gpu/drm/i915/display/intel_atomic.c  |  1 -
 drivers/gpu/drm/i915/display/intel_display.c |  2 -
 drivers/gpu/drm/i915/display/intel_dp.c      |  6 +++
 drivers/gpu/drm/i915/display/intel_psr.c     | 41 --------------------
 drivers/gpu/drm/i915/display/intel_psr.h     |  4 --
 drivers/gpu/drm/i915/i915_drv.h              |  1 -
 6 files changed, 6 insertions(+), 49 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +0 -1
index 86be032bcf96..63d8d6840655 100644
@@ -133,7 +133,6 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,
 	struct drm_crtc_state *crtc_state;
 
 	intel_hdcp_atomic_check(conn, old_state, new_state);
-	intel_psr_atomic_check(conn, old_state, new_state);
 
 	if (!new_state->crtc)
 		return 0;
drivers/gpu/drm/i915/display/intel_display.c +0 -2
index cddbda5303ff..3c3adaee7b49 100644
@@ -18373,8 +18373,6 @@ int intel_modeset_init(struct drm_i915_private *i915)
 
 	intel_init_ipc(i915);
 
-	intel_psr_set_force_mode_changed(i915->psr.dp);
-
 	return 0;
 }
 
drivers/gpu/drm/i915/display/intel_dp.c +6 -0
index cf09aca7607b..3b0dbda5919a 100644
@@ -3778,6 +3778,12 @@ bool intel_dp_initial_fastset_check(struct intel_encoder *encoder,
 		return false;
 	}
 
+	if (CAN_PSR(i915) && intel_dp_is_edp(intel_dp)) {
+		drm_dbg_kms(&i915->drm, "Forcing full modeset to compute PSR state\n");
+		crtc_state->uapi.mode_changed = true;
+		return false;
+	}
+
 	return true;
 }
 
drivers/gpu/drm/i915/display/intel_psr.c +0 -41

56 lines not on this page · raw message

drivers/gpu/drm/i915/display/intel_psr.h +0 -4
index 3eca9dcec3c0..0a517978e8af 100644
@@ -43,10 +43,6 @@ void intel_psr_short_pulse(struct intel_dp *intel_dp);
 int intel_psr_wait_for_idle(const struct intel_crtc_state *new_crtc_state,
 			    u32 *out_value);
 bool intel_psr_enabled(struct intel_dp *intel_dp);
-void intel_psr_atomic_check(struct drm_connector *connector,
-			    struct drm_connector_state *old_state,
-			    struct drm_connector_state *new_state);
-void intel_psr_set_force_mode_changed(struct intel_dp *intel_dp);
 int intel_psr2_sel_fetch_update(struct intel_atomic_state *state,
 				struct intel_crtc *crtc);
 void intel_psr2_program_trans_man_trk_ctl(const struct intel_crtc_state *crtc_state);
drivers/gpu/drm/i915/i915_drv.h +0 -1
index bcd8650603d8..8e4a5468b1d0 100644
@@ -508,7 +508,6 @@ struct i915_psr {
 	bool dc3co_enabled;
 	u32 dc3co_exit_delay;
 	struct delayed_work dc3co_work;
-	bool force_mode_changed;
 	struct drm_dp_vsc_sdp vsc;
 };
 
Signature · 6 lines
2.29.2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/display: Use initial_fastset_check() to compute and apply the initial PSR state

== Series Details ==

== Series Details ==

Series: drm/i915/display: Use initial_fastset_check() to compute and apply the initial PSR state
URL : https://patchwork.freedesktop.org/series/83375/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_9247 -> Patchwork_18831
====================================================

Summary
-------

**SUCCESS**

No regressions found.

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

New tests
---------

New tests have been introduced between CI_DRM_9247 and Patchwork_18831:

### New CI tests (1) ###

* boot:
- Statuses : 39 pass(s)
- Exec time: [0.0] s

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

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

### IGT changes ###

#### Issues hit ####

* igt@i915_module_load@reload:
- fi-icl-u2: [PASS][1] -> [DMESG-WARN][2] ([i915#1982])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/fi-icl-u2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/fi-icl-u2/igt@[email protected]

* igt@i915_pm_rpm@module-reload:
- fi-byt-j1900: [PASS][3] -> [DMESG-WARN][4] ([i915#1982])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/fi-byt-j1900/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/fi-byt-j1900/igt@[email protected]

#### Possible fixes ####

* igt@i915_module_load@reload:
- fi-apl-guc: [DMESG-WARN][5] ([i915#1635] / [i915#1982]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/fi-apl-guc/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/fi-apl-guc/igt@[email protected]

* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-bsw-kefka: [DMESG-WARN][7] ([i915#1982]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/fi-bsw-kefka/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/fi-bsw-kefka/igt@[email protected]

* igt@i915_selftest@live@gt_heartbeat:
- {fi-tgl-dsi}: [DMESG-FAIL][9] ([i915#2601]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/fi-tgl-dsi/igt@i915_selftest@live@gt_heartbeat.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/fi-tgl-dsi/igt@i915_selftest@live@gt_heartbeat.html

* igt@i915_selftest@live@gt_timelines:
- fi-apl-guc: [INCOMPLETE][11] ([i915#1635]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/fi-apl-guc/igt@i915_selftest@live@gt_timelines.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/fi-apl-guc/igt@i915_selftest@live@gt_timelines.html

* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- {fi-kbl-7560u}: [DMESG-WARN][13] ([i915#1982]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/fi-kbl-7560u/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/fi-kbl-7560u/igt@[email protected]

* igt@kms_flip@basic-flip-vs-wf_vblank@c-edp1:
- fi-icl-u2: [DMESG-WARN][15] ([i915#1982]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/fi-icl-u2/igt@kms_flip@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/fi-icl-u2/igt@kms_flip@[email protected]

#### Warnings ####

* igt@amdgpu/amd_prime@i915-to-amd:
- fi-gdg-551: [INCOMPLETE][17] ([i915#172]) -> [SKIP][18] ([fdo#109271])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/fi-gdg-551/igt@amdgpu/[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/fi-gdg-551/igt@amdgpu/[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
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#172]: https://gitlab.freedesktop.org/drm/intel/issues/172
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2601]: https://gitlab.freedesktop.org/drm/intel/issues/2601

Participating hosts (43 -> 39)
------------------------------

Missing (4): fi-ilk-m540 fi-bsw-cyan fi-bdw-samus fi-hsw-4200u

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

* Linux: CI_DRM_9247 -> Patchwork_18831

CI-20190529: 20190529
CI_DRM_9247: 009a99e9be393d32ed57bcac34d6b1fb37c28cdf @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5830: 12d370cb57e0cfcb781c87ad9e15e68b17a1f41f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18831: 073dde9f1009e72e545696f72578ac82a834f9cc @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

073dde9f1009 drm/i915/display: Use initial_fastset_check() to compute and apply the initial PSR state

== Logs ==

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

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/display: Use initial_fastset_check() to compute and apply the initial PSR state

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

== Series Details ==

Series: drm/i915/display: Use initial_fastset_check() to compute and apply the initial PSR state
URL : https://patchwork.freedesktop.org/series/83375/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_9247_full -> Patchwork_18831_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

New tests
---------

New tests have been introduced between CI_DRM_9247_full and Patchwork_18831_full:

### New CI tests (1) ###

* boot:
- Statuses : 175 pass(s)
- Exec time: [0.0] s

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

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

### IGT changes ###

#### Issues hit ####

* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-skl: [PASS][1] -> [INCOMPLETE][2] ([i915#300])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-skl4/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-skl6/igt@[email protected]

* igt@kms_cursor_crc@pipe-b-cursor-64x21-offscreen:
- shard-skl: [PASS][3] -> [FAIL][4] ([i915#54]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-skl9/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-skl9/igt@[email protected]

* igt@kms_cursor_edge_walk@pipe-c-256x256-right-edge:
- shard-glk: [PASS][5] -> [DMESG-WARN][6] ([i915#1982])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-glk4/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-glk4/igt@[email protected]

* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:
- shard-glk: [PASS][7] -> [FAIL][8] ([i915#72])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-glk6/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-glk4/igt@[email protected]

* igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions-varying-size:
- shard-skl: [PASS][9] -> [DMESG-WARN][10] ([i915#1982]) +7 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-skl10/igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions-varying-size.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-skl2/igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions-varying-size.html

* igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-untiled:
- shard-apl: [PASS][11] -> [DMESG-WARN][12] ([i915#1635] / [i915#1982])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-apl6/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-apl4/igt@[email protected]

* igt@kms_draw_crc@draw-method-xrgb8888-mmap-wc-untiled:
- shard-kbl: [PASS][13] -> [DMESG-WARN][14] ([i915#1982]) +2 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-kbl1/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-kbl4/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-dp1:
- shard-apl: [PASS][15] -> [FAIL][16] ([i915#1635] / [i915#79])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-apl1/igt@kms_flip@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-apl8/igt@kms_flip@[email protected]

* igt@kms_frontbuffer_tracking@fbc-rgb101010-draw-render:
- shard-snb: [PASS][17] -> [FAIL][18] ([i915#2546])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-snb7/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-snb4/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-mmap-wc:
- shard-tglb: [PASS][19] -> [DMESG-WARN][20] ([i915#1982])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-tglb6/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-tglb8/igt@[email protected]

* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
- shard-kbl: [PASS][21] -> [DMESG-WARN][22] ([i915#180])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-kbl7/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-kbl7/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][23] -> [FAIL][24] ([fdo#108145] / [i915#265])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-skl7/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-skl2/igt@[email protected]

* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [PASS][25] -> [SKIP][26] ([fdo#109441]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-iclb6/igt@kms_psr@psr2_primary_mmap_cpu.html

#### Possible fixes ####

* igt@core_hotunplug@unbind-rebind:
- shard-skl: [DMESG-WARN][27] ([i915#1982]) -> [PASS][28] +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-skl10/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-skl2/igt@[email protected]

* igt@gem_exec_schedule@deep@vecs0:
- shard-skl: [INCOMPLETE][29] -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-skl3/igt@gem_exec_schedule@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-skl1/igt@gem_exec_schedule@[email protected]

* igt@gem_partial_pwrite_pread@writes-after-reads-uncached:
- shard-snb: [FAIL][31] -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-snb7/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-snb4/igt@[email protected]

* igt@gem_pipe_control_store_loop@fresh-buffer:
- shard-tglb: [INCOMPLETE][33] -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-tglb1/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-tglb3/igt@[email protected]

* {igt@kms_async_flips@async-flip-with-page-flip-events}:
- shard-kbl: [FAIL][35] ([i915#2521]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-kbl3/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-kbl6/igt@[email protected]
- shard-tglb: [FAIL][37] ([i915#2521]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-tglb1/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-tglb5/igt@[email protected]

* igt@kms_atomic_transition@plane-use-after-nonblocking-unbind-fencing@hdmi-a-1-pipe-a:
- shard-glk: [DMESG-WARN][39] ([i915#1982]) -> [PASS][40] +1 similar issue
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-glk5/igt@kms_atomic_transition@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-glk7/igt@kms_atomic_transition@[email protected]

* igt@kms_cursor_crc@pipe-b-cursor-128x128-random:
- shard-skl: [FAIL][41] ([i915#54]) -> [PASS][42] +5 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-skl10/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-skl10/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-skl: [FAIL][43] ([i915#2346]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-skl8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-skl3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html

* igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-untiled:
- shard-skl: [FAIL][45] ([i915#52] / [i915#54]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-skl8/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-skl9/igt@[email protected]

* igt@kms_flip@2x-flip-vs-expired-vblank@ab-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][47] ([i915#79]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-glk2/igt@kms_flip@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-glk6/igt@kms_flip@[email protected]

* igt@kms_flip@2x-plain-flip-fb-recreate-interruptible@bc-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][49] ([i915#2122]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-glk9/igt@kms_flip@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-glk3/igt@kms_flip@[email protected]

* igt@kms_flip@dpms-vs-vblank-race@b-dp1:
- shard-kbl: [INCOMPLETE][51] -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-kbl6/igt@kms_flip@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-kbl3/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-expired-vblank@c-edp1:
- shard-skl: [FAIL][53] ([i915#79]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-skl10/igt@kms_flip@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-skl10/igt@kms_flip@[email protected]

* igt@kms_flip_tiling@flip-to-yf-tiled:
- shard-kbl: [DMESG-WARN][55] ([i915#1982]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-kbl4/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-kbl1/igt@[email protected]

* igt@kms_frontbuffer_tracking@psr-rgb101010-draw-mmap-wc:
- shard-iclb: [DMESG-WARN][57] ([i915#1982]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-iclb3/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-iclb4/igt@[email protected]

* igt@kms_frontbuffer_tracking@psr-rgb565-draw-pwrite:
- shard-tglb: [DMESG-WARN][59] ([i915#1982]) -> [PASS][60] +1 similar issue
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-tglb2/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-tglb2/igt@[email protected]

* igt@kms_hdr@bpc-switch-suspend:
- shard-skl: [FAIL][61] ([i915#1188]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-skl3/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-skl1/igt@[email protected]

* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
- shard-iclb: [INCOMPLETE][63] ([i915#1185] / [i915#250]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-iclb3/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-iclb8/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [FAIL][65] ([fdo#108145] / [i915#265]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-skl7/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-skl4/igt@[email protected]

* igt@kms_psr@psr2_sprite_mmap_gtt:
- shard-iclb: [SKIP][67] ([fdo#109441]) -> [PASS][68] +1 similar issue
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-iclb1/igt@kms_psr@psr2_sprite_mmap_gtt.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_gtt.html

* igt@kms_sequence@queue-idle:
- shard-skl: [FAIL][69] ([i915#2441]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-skl3/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-skl1/igt@[email protected]

* igt@kms_vblank@pipe-b-wait-forked-busy-hang:
- shard-apl: [DMESG-WARN][71] ([i915#1635] / [i915#1982]) -> [PASS][72] +2 similar issues
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-apl1/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-apl8/igt@[email protected]

* igt@sysfs_heartbeat_interval@mixed@bcs0:
- shard-skl: [FAIL][73] ([i915#1731]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-skl2/igt@sysfs_heartbeat_interval@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-skl8/igt@sysfs_heartbeat_interval@[email protected]

#### Warnings ####

* igt@kms_color@pipe-a-ctm-red-to-blue:
- shard-skl: [DMESG-FAIL][75] ([i915#1982]) -> [DMESG-WARN][76] ([i915#1982])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-skl8/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-skl9/igt@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible@a-edp1:
- shard-tglb: [DMESG-WARN][77] ([i915#2411]) -> [INCOMPLETE][78] ([i915#1436] / [i915#456])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-tglb7/igt@kms_flip@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-tglb5/igt@kms_flip@[email protected]

* igt@kms_flip_tiling@flip-x-tiled:
- shard-skl: [DMESG-FAIL][79] ([fdo#108145] / [i915#1982]) -> [DMESG-WARN][80] ([i915#1982])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-skl8/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-skl9/igt@[email protected]

* igt@runner@aborted:
- shard-tglb: ([FAIL][81], [FAIL][82]) ([i915#2439]) -> ([FAIL][83], [FAIL][84]) ([i915#2248] / [i915#2439])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-tglb1/igt@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9247/shard-tglb2/igt@[email protected]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-tglb2/igt@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/shard-tglb5/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#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#1185]: https://gitlab.freedesktop.org/drm/intel/issues/1185
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1731]: https://gitlab.freedesktop.org/drm/intel/issues/1731
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2248]: https://gitlab.freedesktop.org/drm/intel/issues/2248
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#2439]: https://gitlab.freedesktop.org/drm/intel/issues/2439
[i915#2441]: https://gitlab.freedesktop.org/drm/intel/issues/2441
[i915#250]: https://gitlab.freedesktop.org/drm/intel/issues/250
[i915#2502]: https://gitlab.freedesktop.org/drm/intel/issues/2502
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2546]: https://gitlab.freedesktop.org/drm/intel/issues/2546
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#300]: https://gitlab.freedesktop.org/drm/intel/issues/300
[i915#456]: https://gitlab.freedesktop.org/drm/intel/issues/456
[i915#52]: https://gitlab.freedesktop.org/drm/intel/issues/52
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#72]: https://gitlab.freedesktop.org/drm/intel/issues/72
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79

Participating hosts (11 -> 11)
------------------------------

No changes in participating hosts

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

* Linux: CI_DRM_9247 -> Patchwork_18831

CI-20190529: 20190529
CI_DRM_9247: 009a99e9be393d32ed57bcac34d6b1fb37c28cdf @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5830: 12d370cb57e0cfcb781c87ad9e15e68b17a1f41f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18831: 073dde9f1009e72e545696f72578ac82a834f9cc @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

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

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

Re: [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/display: Use initial_fastset_check() to compute and apply the initial PSR state

Quoted 5 lines · Patchwork

Patch Details
Series: drm/i915/display: Use initial_fastset_check() to compute and apply the initial PSR state URL:
https://patchwork.freedesktop.org/series/83375/ State: success Details: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18831/index.html
CI Bug Log - changes from CI_DRM_9247_full -> Patchwork_18831_fullSummarySUCCESS
No regressions found.

Thanks for the review Imre, pushed to dinq.

Quoted 44 lines

New testsNew tests have been introduced between CI_DRM_9247_full and Patchwork_18831_full:
New CI tests (1) * boot:Statuses : 175 pass(s)Exec time: [0.0] s
Known issuesHere are the changes found in Patchwork_18831_full that come from known issues:
IGT changesIssues hit * igt@kms_cursor_crc@pipe-a-cursor-suspend:shard-skl: PASS -> INCOMPLETE (i915#300)
 * igt@kms_cursor_crc@pipe-b-cursor-64x21-offscreen:shard-skl: PASS -> FAIL (i915#54) +1 similar issue
 * igt@kms_cursor_edge_walk@pipe-c-256x256-right-edge:shard-glk: PASS -> DMESG-WARN (i915#1982)
 * igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:shard-glk: PASS -> FAIL (i915#72)
 * igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions-varying-size:shard-skl: PASS -> DMESG-WARN (i915#1982) +7 similar issues
 * igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-untiled:shard-apl: PASS -> DMESG-WARN (i915#1635 / i915#1982)
 * igt@kms_draw_crc@draw-method-xrgb8888-mmap-wc-untiled:shard-kbl: PASS -> DMESG-WARN (i915#1982) +2 similar issues
 * igt@kms_flip@flip-vs-expired-vblank-interruptible@a-dp1:shard-apl: PASS -> FAIL (i915#1635 / i915#79)
 * igt@kms_frontbuffer_tracking@fbc-rgb101010-draw-render:shard-snb: PASS -> FAIL (i915#2546)
 * igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-mmap-wc:shard-tglb: PASS -> DMESG-WARN (i915#1982)
 * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:shard-kbl: PASS -> DMESG-WARN (i915#180)
 * igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:shard-skl: PASS -> FAIL (fdo#108145 / i915#265)
 * igt@kms_psr@psr2_primary_mmap_cpu:shard-iclb: PASS -> SKIP (fdo#109441) +1 similar issue
Possible fixes * igt@core_hotunplug@unbind-rebind:shard-skl: DMESG-WARN (i915#1982) -> PASS +1 similar issue
 * igt@gem_exec_schedule@deep@vecs0:shard-skl: INCOMPLETE -> PASS
 * igt@gem_partial_pwrite_pread@writes-after-reads-uncached:shard-snb: FAIL -> PASS
 * igt@gem_pipe_control_store_loop@fresh-buffer:shard-tglb: INCOMPLETE -> PASS
 * {igt@kms_async_flips@async-flip-with-page-flip-events}:shard-kbl: FAIL (i915#2521) -> PASSshard-tglb: FAIL (i915#2521) -> PASS
 * igt@kms_atomic_transition@plane-use-after-nonblocking-unbind-fencing@hdmi-a-1-pipe-a:shard-glk: DMESG-WARN (i915#1982) -> PASS +1 similar issue
 * igt@kms_cursor_crc@pipe-b-cursor-128x128-random:shard-skl: FAIL (i915#54) -> PASS +5 similar issues
 * igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:shard-skl: FAIL (i915#2346) -> PASS
 * igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-untiled:shard-skl: FAIL (i915#52 / i915#54) -> PASS
 * igt@kms_flip@2x-flip-vs-expired-vblank@ab-hdmi-a1-hdmi-a2:shard-glk: FAIL (i915#79) -> PASS
 * igt@kms_flip@2x-plain-flip-fb-recreate-interruptible@bc-hdmi-a1-hdmi-a2:shard-glk: FAIL (i915#2122) -> PASS
 * igt@kms_flip@dpms-vs-vblank-race@b-dp1:shard-kbl: INCOMPLETE -> PASS
 * igt@kms_flip@flip-vs-expired-vblank@c-edp1:shard-skl: FAIL (i915#79) -> PASS
 * igt@kms_flip_tiling@flip-to-yf-tiled:shard-kbl: DMESG-WARN (i915#1982) -> PASS
 * igt@kms_frontbuffer_tracking@psr-rgb101010-draw-mmap-wc:shard-iclb: DMESG-WARN (i915#1982) -> PASS
 * igt@kms_frontbuffer_tracking@psr-rgb565-draw-pwrite:shard-tglb: DMESG-WARN (i915#1982) -> PASS +1 similar issue
 * igt@kms_hdr@bpc-switch-suspend:shard-skl: FAIL (i915#1188) -> PASS
 * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:shard-iclb: INCOMPLETE (i915#1185 / i915#250) -> PASS
 * igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:shard-skl: FAIL (fdo#108145 / i915#265) -> PASS
 * igt@kms_psr@psr2_sprite_mmap_gtt:shard-iclb: SKIP (fdo#109441) -> PASS +1 similar issue
 * igt@kms_sequence@queue-idle:shard-skl: FAIL (i915#2441) -> PASS
 * igt@kms_vblank@pipe-b-wait-forked-busy-hang:shard-apl: DMESG-WARN (i915#1635 / i915#1982) -> PASS +2 similar issues
 * igt@sysfs_heartbeat_interval@mixed@bcs0:shard-skl: FAIL (i915#1731) -> PASS
Warnings * igt@kms_color@pipe-a-ctm-red-to-blue:shard-skl: DMESG-FAIL (i915#1982) -> DMESG-WARN (i915#1982)
 * igt@kms_flip@flip-vs-suspend-interruptible@a-edp1:shard-tglb: DMESG-WARN (i915#2411) -> INCOMPLETE (i915#1436 / i915#456)
 * igt@kms_flip_tiling@flip-x-tiled:shard-skl: DMESG-FAIL (fdo#108145 / i915#1982) -> DMESG-WARN (i915#1982)
 * igt@runner@aborted:shard-tglb: (FAIL, FAIL) (i915#2439) -> (FAIL, FAIL) (i915#2248 / i915#2439)
{name}: This element is suppressed. This means it is ignored when computing

Quoted 8 lines

 the status of the difference (SUCCESS, WARNING, or FAILURE).
Participating hosts (11 -> 11)No changes in participating hosts
Build changes * Linux: CI_DRM_9247 -> Patchwork_18831
CI-20190529: 20190529
 CI_DRM_9247: 009a99e9be393d32ed57bcac34d6b1fb37c28cdf @ git://anongit.freedesktop.org/gfx-ci/linux
 IGT_5830: 12d370cb57e0cfcb781c87ad9e15e68b17a1f41f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
 Patchwork_18831: 073dde9f1009e72e545696f72578ac82a834f9cc @ git://anongit.freedesktop.org/gfx-ci/linux
 piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1
#4 lore raw
In reply to José Roberto de Souza
Quoted 6 lines · José Roberto de Souza

Replace the previous approach to force compute the initial PSR state after i915 take over from firmware by the better and recently added initial_fastset_check() hook.

Looks ok to me:

Quoted 144 lines
---
 drivers/gpu/drm/i915/display/intel_atomic.c  |  1 -
 drivers/gpu/drm/i915/display/intel_display.c |  2 -
 drivers/gpu/drm/i915/display/intel_dp.c      |  6 +++
 drivers/gpu/drm/i915/display/intel_psr.c     | 41 --------------------
 drivers/gpu/drm/i915/display/intel_psr.h     |  4 --
 drivers/gpu/drm/i915/i915_drv.h              |  1 -
 6 files changed, 6 insertions(+), 49 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +0 -1
index 86be032bcf96..63d8d6840655 100644
@@ -133,7 +133,6 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,
 	struct drm_crtc_state *crtc_state;
 
 	intel_hdcp_atomic_check(conn, old_state, new_state);
-	intel_psr_atomic_check(conn, old_state, new_state);
 
 	if (!new_state->crtc)
 		return 0;
drivers/gpu/drm/i915/display/intel_display.c +0 -2
index cddbda5303ff..3c3adaee7b49 100644
@@ -18373,8 +18373,6 @@ int intel_modeset_init(struct drm_i915_private *i915)
 
 	intel_init_ipc(i915);
 
-	intel_psr_set_force_mode_changed(i915->psr.dp);
-
 	return 0;
 }
 
drivers/gpu/drm/i915/display/intel_dp.c +6 -0
index cf09aca7607b..3b0dbda5919a 100644
@@ -3778,6 +3778,12 @@ bool intel_dp_initial_fastset_check(struct intel_encoder *encoder,
 		return false;
 	}
 
+	if (CAN_PSR(i915) && intel_dp_is_edp(intel_dp)) {
+		drm_dbg_kms(&i915->drm, "Forcing full modeset to compute PSR state\n");
+		crtc_state->uapi.mode_changed = true;
+		return false;
+	}
+
 	return true;
 }
 
drivers/gpu/drm/i915/display/intel_psr.c +0 -41
index 1576c3722d0b..b3631b722de3 100644
@@ -1024,8 +1024,6 @@ void intel_psr_enable(struct intel_dp *intel_dp,
 	if (!CAN_PSR(dev_priv) || dev_priv->psr.dp != intel_dp)
 		return;
 
-	dev_priv->psr.force_mode_changed = false;
-
 	if (!crtc_state->has_psr)
 		return;
 
@@ -1334,8 +1332,6 @@ void intel_psr_update(struct intel_dp *intel_dp,
 	if (!CAN_PSR(dev_priv) || READ_ONCE(psr->dp) != intel_dp)
 		return;
 
-	dev_priv->psr.force_mode_changed = false;
-
 	mutex_lock(&dev_priv->psr.lock);
 
 	enable = crtc_state->has_psr;
@@ -1869,40 +1865,3 @@ bool intel_psr_enabled(struct intel_dp *intel_dp)
 
 	return ret;
 }
-
-void intel_psr_atomic_check(struct drm_connector *connector,
-			    struct drm_connector_state *old_state,
-			    struct drm_connector_state *new_state)
-{
-	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	struct intel_connector *intel_connector;
-	struct intel_digital_port *dig_port;
-	struct drm_crtc_state *crtc_state;
-
-	if (!CAN_PSR(dev_priv) || !new_state->crtc ||
-	    !dev_priv->psr.force_mode_changed)
-		return;
-
-	intel_connector = to_intel_connector(connector);
-	dig_port = enc_to_dig_port(to_intel_encoder(new_state->best_encoder));
-	if (dev_priv->psr.dp != &dig_port->dp)
-		return;
-
-	crtc_state = drm_atomic_get_new_crtc_state(new_state->state,
-						   new_state->crtc);
-	crtc_state->mode_changed = true;
-}
-
-void intel_psr_set_force_mode_changed(struct intel_dp *intel_dp)
-{
-	struct drm_i915_private *dev_priv;
-
-	if (!intel_dp)
-		return;
-
-	dev_priv = dp_to_i915(intel_dp);
-	if (!CAN_PSR(dev_priv) || intel_dp != dev_priv->psr.dp)
-		return;
-
-	dev_priv->psr.force_mode_changed = true;
-}
drivers/gpu/drm/i915/display/intel_psr.h +0 -4
index 3eca9dcec3c0..0a517978e8af 100644
@@ -43,10 +43,6 @@ void intel_psr_short_pulse(struct intel_dp *intel_dp);
 int intel_psr_wait_for_idle(const struct intel_crtc_state *new_crtc_state,
 			    u32 *out_value);
 bool intel_psr_enabled(struct intel_dp *intel_dp);
-void intel_psr_atomic_check(struct drm_connector *connector,
-			    struct drm_connector_state *old_state,
-			    struct drm_connector_state *new_state);
-void intel_psr_set_force_mode_changed(struct intel_dp *intel_dp);
 int intel_psr2_sel_fetch_update(struct intel_atomic_state *state,
 				struct intel_crtc *crtc);
 void intel_psr2_program_trans_man_trk_ctl(const struct intel_crtc_state *crtc_state);
drivers/gpu/drm/i915/i915_drv.h +0 -1
index bcd8650603d8..8e4a5468b1d0 100644
@@ -508,7 +508,6 @@ struct i915_psr {
 	bool dc3co_enabled;
 	u32 dc3co_exit_delay;
 	struct delayed_work dc3co_work;
-	bool force_mode_changed;
 	struct drm_dp_vsc_sdp vsc;
 };
 
Signature · 1 line
2.29.2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx