drm/i915/psr: Execute the default PSR code path when setting i915_edp_psr_debug
Subsystems (2)
PATCH 1/1 drm/i915/psr: Execute the default PSR code path when setting i915_edp_psr_debug
Changing the i915_edp_psr_debug was enabling, disabling or switching PSR version by directly calling intel_psr_disable_locked() and intel_psr_enable_locked(), what is not the default PSR path that will be executed by real users.
So lets force a fastset in the PSR CRTC to trigger a pipe update and stress the default code path.
Recently a bug was found when switching from PSR2 to PSR1 while enable_psr kernel parameter was set to the default parameter, this changes fix it and also fixes the bug linked bellow were DRRS was left enabled together with PSR when enabling PSR from debugfs.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108341
--- drivers/gpu/drm/i915/i915_debugfs.c | 14 +-- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 6 +- drivers/gpu/drm/i915/intel_psr.c | 188 +++++++++++++++++----------- 5 files changed, 119 insertions(+), 93 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -13
@@ -2607,7 +2607,6 @@ static int i915_edp_psr_debug_set(void *data, u64 val) {struct drm_i915_private *dev_priv = data; -struct drm_modeset_acquire_ctx ctx;intel_wakeref_t wakeref;int ret;
@@ -2618,18 +2617,7 @@ i915_edp_psr_debug_set(void *data, u64 val) wakeref =intel_runtime_pm_get (dev_priv); -drm_modeset_acquire_init (&ctx,DRM_MODESET_ACQUIRE_INTERRUPTIBLE ); - -retry: - ret =intel_psr_set_debugfs_mode (dev_priv, &ctx, val); -if (ret == -EDEADLK ) { - ret =drm_modeset_backoff (&ctx); -if (!ret) - goto retry; - } - -drm_modeset_drop_locks (&ctx); -drm_modeset_acquire_fini (&ctx); + ret =intel_psr_set_debugfs_mode (dev_priv, val);intel_runtime_pm_put (dev_priv, wakeref);
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -496,7 +496,7 @@ struct i915_psr {u32 debug;bool sink_support; -bool prepared, enabled; +bool enabled;struct intel_dp *dp;enum pipe pipe;bool active;
drivers/gpu/drm/i915/intel_ddi.c +1 -1
@@ -3556,7 +3556,7 @@ static void intel_ddi_update_pipe_dp(struct intel_encoder *encoder, {struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -intel_psr_enable (intel_dp, crtc_state); +intel_psr_update (intel_dp, crtc_state);intel_edp_drrs_enable (intel_dp, crtc_state);intel_panel_update_backlight (encoder, crtc_state, conn_state);
drivers/gpu/drm/i915/intel_drv.h +3 -3
@@ -2067,9 +2067,9 @@ void intel_psr_enable(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state);void intel_psr_disable (struct intel_dp *intel_dp,const struct intel_crtc_state *old_crtc_state); -int intel_psr_set_debugfs_mode (struct drm_i915_private *dev_priv, -struct drm_modeset_acquire_ctx *ctx, -u64 value); +void intel_psr_update (struct intel_dp *intel_dp, +const struct intel_crtc_state *crtc_state); +int intel_psr_set_debugfs_mode (struct drm_i915_private *dev_priv,u64 value);void intel_psr_invalidate (struct drm_i915_private *dev_priv,unsigned frontbuffer_bits,enum fb_op_origin origin);
drivers/gpu/drm/i915/intel_psr.c +113 -75
250 lines not on this page · raw message
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx