drm/i915/display: Ignore IGNORE_PSR2_HW_TRACKING for platforms without sel fetch
Subsystems (3)
PATCH v2 1/3 drm/i915/display: Ignore IGNORE_PSR2_HW_TRACKING for platforms without sel fetch
For platforms without selective fetch this register is reserved so do not write 0 to it.
--- drivers/gpu/drm/i915/display/intel_psr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_psr.c +1 -1
@@ -942,7 +942,7 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,intel_de_write (dev_priv,EXITLINE (cpu_transcoder), val); } -if (HAS_PSR_HW_TRACKING (dev_priv)) +if (HAS_PSR_HW_TRACKING (dev_priv) &&HAS_PSR2_SEL_FETCH (dev_priv))intel_de_rmw (dev_priv,CHICKEN_PAR1_1 ,IGNORE_PSR2_HW_TRACKING , dev_priv->psr.psr2_sel_fetch_enabled ?IGNORE_PSR2_HW_TRACKING :0 );
Signature · 6 lines
2.28.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/3 drm/i915/display: Check PSR parameter and flag only in state compute phase
Due to the debugfs flag, has_psr2 in CRTC state could have a different value than psr.psr2_enabled and it was causing PSR2 subfeatures(DC3CO and selective fetch) to be set to not a expected state.
So here only taking in consideration the parameter and debugfs flag when computing PSR state, this way the CRTC state will also have the correct state.
intel_psr_fastset_force() was already broken as intel_psr_compute_config() was already only enabling PSR when psr_global_enabled() and all other PSR requirements are met. So some changes was required in this function, now it iterates over all connectors, if it is a eDP connector and is active force a modeset in the CRTC driving this connector, what will cause the new PSR state to be set based on the debugfs flag.
v2:
- end connector iterator in error cases
--- drivers/gpu/drm/i915/display/intel_psr.c | 73 +++++++++++++----------- 1 file changed, 41 insertions(+), 32 deletions(-)
drivers/gpu/drm/i915/display/intel_psr.c +41 -32
@@ -91,19 +91,14 @@ static bool psr_global_enabled(struct drm_i915_private *i915) } } -static bool intel_psr2_enabled (struct drm_i915_private *dev_priv, -const struct intel_crtc_state *crtc_state) +static bool psr2_global_enabled (struct drm_i915_private *dev_priv) { -/* Cannot enable DSC and PSR2 simultaneously */ -drm_WARN_ON (&dev_priv->drm, crtc_state->dsc.compression_enable && - crtc_state->has_psr2); -switch (dev_priv->psr.debug &I915_PSR_DEBUG_MODE_MASK ) {case I915_PSR_DEBUG_DISABLE :case I915_PSR_DEBUG_FORCE_PSR1 :return false;default : -return crtc_state->has_psr2; +return true; } }
@@ -729,6 +724,11 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,return false; } +if (!psr2_global_enabled (dev_priv)) { +drm_dbg_kms (&dev_priv->drm,"PSR2 disabled by flag\n" ); +return false; + } +/* * DSC and PSR2 cannot be enabled simultaneously. If a requested * resolution requires DSC to be enabled, priority is given to DSC
@@ -817,8 +817,11 @@ void intel_psr_compute_config(struct intel_dp *intel_dp,if (intel_dp != dev_priv->psr.dp)return ; -if (!psr_global_enabled (dev_priv)) +if (!psr_global_enabled (dev_priv)) { +drm_dbg_kms (&dev_priv->drm,"PSR disabled by flag\n" );return ; + } +/* * HSW spec explicitly says PSR is tied to port A. * BDW+ platforms have a instance of PSR registers per transcoder but
@@ -959,7 +962,7 @@ static void intel_psr_enable_locked(struct drm_i915_private *dev_priv,drm_WARN_ON (&dev_priv->drm, dev_priv->psr.enabled); - dev_priv->psr.psr2_enabled =intel_psr2_enabled (dev_priv, crtc_state); + dev_priv->psr.psr2_enabled = crtc_state->has_psr2; dev_priv->psr.busy_frontbuffer_bits =0 ; dev_priv->psr.pipe =to_intel_crtc (crtc_state->uapi.crtc)->pipe; dev_priv->psr.dc3co_enabled = !!crtc_state->dc3co_exitline;
@@ -1029,15 +1032,7 @@ void intel_psr_enable(struct intel_dp *intel_dp,drm_WARN_ON (&dev_priv->drm, dev_priv->drrs.dp);mutex_lock (&dev_priv->psr.lock); - -if (!psr_global_enabled (dev_priv)) { -drm_dbg_kms (&dev_priv->drm,"PSR disabled by flag\n" ); - goto unlock; - } -intel_psr_enable_locked (dev_priv, crtc_state, conn_state); - -unlock:mutex_unlock (&dev_priv->psr.lock); }
@@ -1222,8 +1217,8 @@ void intel_psr_update(struct intel_dp *intel_dp,mutex_lock (&dev_priv->psr.lock); - enable = crtc_state->has_psr &&psr_global_enabled (dev_priv); - psr2_enable =intel_psr2_enabled (dev_priv, crtc_state); + enable = crtc_state->has_psr; + psr2_enable = crtc_state->has_psr2;if (enable == psr->enabled && psr2_enable == psr->psr2_enabled) {/* Force a PSR exit when enabling CRC to avoid CRC timeouts */
@@ -1320,11 +1315,12 @@ static bool __psr_wait_for_idle_locked(struct drm_i915_private *dev_priv)static int intel_psr_fastset_force (struct drm_i915_private *dev_priv) { +struct drm_connector_list_iter conn_iter;struct drm_device *dev = &dev_priv->drm;struct drm_modeset_acquire_ctx ctx;struct drm_atomic_state *state; -struct intel_crtc *crtc; -int err; +struct drm_connector *conn; +int err =0 ; state =drm_atomic_state_alloc (dev);if (!state)
@@ -1334,25 +1330,38 @@ static int intel_psr_fastset_force(struct drm_i915_private *dev_priv) state->acquire_ctx = &ctx; retry: -for_each_intel_crtc (dev, crtc) { -struct intel_crtc_state *crtc_state = -intel_atomic_get_crtc_state (state, crtc); -if (IS_ERR (crtc_state)) { - err =PTR_ERR (crtc_state); - goto error; +drm_connector_list_iter_begin (dev, &conn_iter); +drm_for_each_connector_iter (conn, &conn_iter) { +struct drm_connector_state *conn_state; +struct drm_crtc_state *crtc_state; + +if (conn->connector_type != DRM_MODE_CONNECTOR_eDP) +continue ; + + conn_state =drm_atomic_get_connector_state (state, conn); +if (IS_ERR (conn_state)) { + err =PTR_ERR (conn_state); +break ; } -if (crtc_state->hw.active && crtc_state->has_psr) { -/* Mark mode as changed to trigger a pipe->update() */ - crtc_state->uapi.mode_changed = true; +if (!conn_state->crtc) +continue ; + + crtc_state =drm_atomic_get_crtc_state (state, conn_state->crtc); +if (IS_ERR (crtc_state)) { + err =PTR_ERR (crtc_state);break ; } + +/* Mark mode as changed to trigger a pipe->update() */ + crtc_state->mode_changed = true; } +drm_connector_list_iter_end (&conn_iter); - err =drm_atomic_commit (state); +if (err ==0 ) + err =drm_atomic_commit (state); -error:if (err == -EDEADLK ) {drm_atomic_state_clear (state); err =drm_modeset_backoff (&ctx);
Signature · 6 lines
2.28.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/3 drm/i915/display: Program PSR2 selective fetch registers
In reply to José Roberto de SouzaAnother step towards PSR2 selective fetch, here programming plane selective fetch registers and MAN_TRK_CTL enabling selective fetch but for now it is fetching the whole area of the planes.
The damaged area calculation will come as next and final step.
v2:
- removed warn on when no plane is visible in state
- removed calculations using plane damaged area in intel_psr2_program_plane_sel_fetch()
BSpec: 55229
--- drivers/gpu/drm/i915/display/intel_display.c | 10 +- drivers/gpu/drm/i915/display/intel_psr.c | 120 ++++++++++++++++++- drivers/gpu/drm/i915/display/intel_psr.h | 10 +- drivers/gpu/drm/i915/display/intel_sprite.c | 3 + 4 files changed, 134 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +8 -2
@@ -11812,6 +11812,9 @@ static void i9xx_update_cursor(struct intel_plane *plane,if (INTEL_GEN (dev_priv) >=9 )skl_write_cursor_wm (plane, crtc_state); +if (!needs_modeset (crtc_state)) +intel_psr2_program_plane_sel_fetch (plane, crtc_state, plane_state,0 ); +if (plane->cursor.base != base || plane->cursor.size != fbc_ctl || plane->cursor.cntl != cntl) {
@@ -12823,8 +12826,11 @@ static int intel_crtc_atomic_check(struct intel_atomic_state *state, } -if (!mode_changed) -intel_psr2_sel_fetch_update (state, crtc); +if (!mode_changed) { + ret =intel_psr2_sel_fetch_update (state, crtc); +if (ret) +return ret; + }return 0 ; }
drivers/gpu/drm/i915/display/intel_psr.c +115 -5
137 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_psr.h +8 -2
@@ -15,6 +15,8 @@ struct intel_crtc_state;struct intel_dp ;struct intel_crtc ;struct intel_atomic_state ; +struct intel_plane_state ; +struct intel_plane ;#define CAN_PSR (dev_priv) (HAS_PSR(dev_priv) && dev_priv->psr.sink_support)void intel_psr_init_dpcd (struct intel_dp *intel_dp);
@@ -45,8 +47,12 @@ 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); -void intel_psr2_sel_fetch_update (struct intel_atomic_state *state, -struct intel_crtc *crtc); +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); +void intel_psr2_program_plane_sel_fetch (struct intel_plane *plane, +const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state, +int color_plane);#endif /* __INTEL_PSR_H__ */
drivers/gpu/drm/i915/display/intel_sprite.c +3 -0
@@ -690,6 +690,9 @@ skl_program_plane(struct intel_plane *plane,intel_de_write_fw (dev_priv,PLANE_AUX_OFFSET (pipe, plane_id), (plane_state->color_plane[1 ].y <<16 ) | plane_state->color_plane[1 ].x); +if (!drm_atomic_crtc_needs_modeset (&crtc_state->uapi)) +intel_psr2_program_plane_sel_fetch (plane, crtc_state, plane_state, color_plane); +/* * The control register self-arms if the plane was previously * disabled. Try to make the plane enable atomic by writing
Signature · 6 lines
2.28.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [v2,1/3] drm/i915/display: Ignore IGNORE_PSR2_HW_TRACKING for platforms without sel fetch
In reply to José Roberto de Souza== Series Details ==
== Series Details ==
Series: series starting with [v2,1/3] drm/i915/display: Ignore IGNORE_PSR2_HW_TRACKING for platforms without sel fetch
URL : https://patchwork.freedesktop.org/series/81758/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9019 -> Patchwork_18515
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/index.html
Known issues
------------
Here are the changes found in Patchwork_18515 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_flink_basic@double-flink:
- fi-tgl-y: [PASS][1] -> [DMESG-WARN][2] ([i915#402]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-tgl-y/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-tgl-y/igt@[email protected]
* igt@kms_cursor_legacy@basic-flip-before-cursor-atomic:
- fi-icl-u2: [PASS][3] -> [DMESG-WARN][4] ([i915#1982])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-icl-u2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-icl-u2/igt@[email protected]
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
- fi-tgl-y: [PASS][5] -> [DMESG-WARN][6] ([i915#1982]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-tgl-y/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-tgl-y/igt@[email protected]
* igt@vgem_basic@unload:
- fi-skl-guc: [PASS][7] -> [DMESG-WARN][8] ([i915#2203])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-skl-guc/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-skl-guc/igt@[email protected]
- fi-kbl-x1275: [PASS][9] -> [DMESG-WARN][10] ([i915#62] / [i915#92])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-kbl-x1275/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-kbl-x1275/igt@[email protected]
#### Possible fixes ####
* {igt@core_hotunplug@unbind-rebind}:
- fi-kbl-x1275: [DMESG-WARN][11] ([i915#62] / [i915#92] / [i915#95]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-kbl-x1275/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-kbl-x1275/igt@[email protected]
* igt@i915_module_load@reload:
- {fi-tgl-dsi}: [DMESG-WARN][13] ([i915#1982] / [k.org#205379]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-tgl-dsi/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-tgl-dsi/igt@[email protected]
- fi-byt-j1900: [DMESG-WARN][15] ([i915#1982]) -> [PASS][16] +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-byt-j1900/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-byt-j1900/igt@[email protected]
- fi-apl-guc: [DMESG-WARN][17] ([i915#1635] / [i915#1982]) -> [PASS][18] +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-apl-guc/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-apl-guc/igt@[email protected]
- fi-tgl-y: [DMESG-WARN][19] ([i915#1982] / [k.org#205379]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-tgl-y/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-tgl-y/igt@[email protected]
* igt@kms_busy@basic@modeset:
- fi-tgl-y: [DMESG-WARN][21] ([i915#1982]) -> [PASS][22] +2 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-tgl-y/igt@kms_busy@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-tgl-y/igt@kms_busy@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- {fi-kbl-7560u}: [DMESG-WARN][23] ([i915#1982]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-kbl-7560u/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-kbl-7560u/igt@[email protected]
* igt@kms_flip@basic-flip-vs-wf_vblank@c-edp1:
- fi-icl-u2: [DMESG-WARN][25] ([i915#1982]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-icl-u2/igt@kms_flip@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-icl-u2/igt@kms_flip@[email protected]
* igt@vgem_basic@setversion:
- fi-tgl-y: [DMESG-WARN][27] ([i915#402]) -> [PASS][28] +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-tgl-y/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-tgl-y/igt@[email protected]
#### Warnings ####
* igt@i915_pm_rpm@module-reload:
- fi-tgl-y: [DMESG-WARN][29] ([i915#2411]) -> [DMESG-WARN][30] ([i915#1982] / [i915#2411])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-tgl-y/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-tgl-y/igt@[email protected]
- fi-kbl-guc: [DMESG-WARN][31] ([i915#2203]) -> [DMESG-FAIL][32] ([i915#2203])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-kbl-guc/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-kbl-guc/igt@[email protected]
* igt@i915_selftest@live@execlists:
- fi-icl-u2: [DMESG-WARN][33] ([i915#289]) -> [INCOMPLETE][34] ([i915#2276] / [i915#2292])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-icl-u2/igt@i915_selftest@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-icl-u2/igt@i915_selftest@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c:
- fi-kbl-x1275: [DMESG-WARN][35] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][36] ([i915#62] / [i915#92]) +4 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-kbl-x1275/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-kbl-x1275/igt@[email protected]
* igt@prime_vgem@basic-fence-flip:
- fi-kbl-x1275: [DMESG-WARN][37] ([i915#62] / [i915#92]) -> [DMESG-WARN][38] ([i915#62] / [i915#92] / [i915#95])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9019/fi-kbl-x1275/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/fi-kbl-x1275/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
[i915#2276]: https://gitlab.freedesktop.org/drm/intel/issues/2276
[i915#2292]: https://gitlab.freedesktop.org/drm/intel/issues/2292
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#289]: https://gitlab.freedesktop.org/drm/intel/issues/289
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
[k.org#205379]: https://bugzilla.kernel.org/show_bug.cgi?id=205379
Participating hosts (45 -> 39)
------------------------------
Additional (1): fi-skl-6700k2
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_9019 -> Patchwork_18515
CI-20190529: 20190529
CI_DRM_9019: 038c228475ce10a6f9cc4052250a1315f3c7c627 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5786: 222051026b978ebbc0dc58db62d7a1f29728f95f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18515: fa5912e60f5e9d4c65e08bd43d25a23c6fb27470 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
fa5912e60f5e drm/i915/display: Program PSR2 selective fetch registers fd6432eb85d3 drm/i915/display: Check PSR parameter and flag only in state compute phase 904b4016dddf drm/i915/display: Ignore IGNORE_PSR2_HW_TRACKING for platforms without sel fetch
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18515/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx