drm/i915: Lockless wait for PSR idle.
Subsystems (2)
PATCH v3 1/2 drm/i915: Lockless wait for PSR idle.
Before checking for vblank evasion in pipe_update_start, we need to wait for PSR idle. intel_psr.c already has psr_wait_for_idle but we don't need any psr locks in pipe_update_start anyway b/c psr_enable/disable won't race there. There is some code duplication here but can't help it (borrowed from psr_wait_for_idle).
--- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_psr.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+)
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -1919,6 +1919,7 @@ void intel_psr_compute_config(struct intel_dp *intel_dp, struct intel_crtc_state *crtc_state);void intel_psr_irq_control (struct drm_i915_private *dev_priv,bool debug);void intel_psr_irq_handler (struct drm_i915_private *dev_priv,u32 psr_iir); +void intel_psr_wait_for_idle (struct drm_i915_private *dev_priv);/* intel_runtime_pm.c */ int intel_power_domains_init (struct drm_i915_private *);
drivers/gpu/drm/i915/intel_psr.c +17 -0
@@ -883,6 +883,23 @@ void intel_psr_disable(struct intel_dp *intel_dp,cancel_delayed_work_sync (&dev_priv->psr.work); } +void intel_psr_wait_for_idle (struct drm_i915_private *dev_priv) +{ +i915_reg_t reg; +u32 mask; + +if (dev_priv->psr.psr2_enabled) { + reg =EDP_PSR2_STATUS ; + mask =EDP_PSR2_STATUS_STATE_MASK ; + }else { + reg =EDP_PSR_STATUS ; + mask =EDP_PSR_STATUS_STATE_MASK ; + } + +if (intel_wait_for_register (dev_priv, reg, mask,0 ,25 )) +DRM_ERROR ("Timed out waiting for PSR Idle\n" ); +} +static bool psr_wait_for_idle (struct drm_i915_private *dev_priv) {struct intel_dp *intel_dp;
Signature · 6 lines
2.13.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 42 lines · Tarun Vyas
Before checking for vblank evasion in
pipe_update_start, we need to wait for PSR idle.intel_psr.calready haspsr_wait_for_idlebut we don't need any psr locks inpipe_update_startanyway b/c psr_enable/disable won't race there. There is some code duplication here but can't help it (borrowed frompsr_wait_for_idle).Signed-off-by Tarun Vyas <[email protected]>--- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_psr.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+)drivers/gpu/drm/i915/intel_drv.h +1
-0@@ -1919,6 +1919,7 @@ void intel_psr_compute_config(struct intel_dp *intel_dp, struct intel_crtc_state *crtc_state);void intel_psr_irq_control (struct drm_i915_private *dev_priv,bool debug);void intel_psr_irq_handler (struct drm_i915_private *dev_priv,u32 psr_iir); +void intel_psr_wait_for_idle (struct drm_i915_private *dev_priv);/* intel_runtime_pm.c */ int intel_power_domains_init (struct drm_i915_private *);drivers/gpu/drm/i915/intel_psr.c +10
-0@@ -883,6 +883,23 @@ void intel_psr_disable(struct intel_dp *intel_dp,cancel_delayed_work_sync (&dev_priv->psr.work); } +void intel_psr_wait_for_idle (struct drm_i915_private *dev_priv) +{ +i915_reg_t reg; +u32 mask; + +if (dev_priv->psr.psr2_enabled) { + reg =EDP_PSR2_STATUS ; + mask =EDP_PSR2_STATUS_STATE_MASK ; + }else { + reg =EDP_PSR_STATUS ;
drivers/gpu/drm/i915/intel_psr.c void intel_psr_disable(struct intel_dp *intel_dp, · line 905
Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c +7
-0+ mask =EDP_PSR_STATUS_STATE_MASK ; + } + +if (intel_wait_for_register (dev_priv, reg, mask,0 ,25 )) +DRM_ERROR ("Timed out waiting for PSR Idle\n" ); +} +static bool psr_wait_for_idle (struct drm_i915_private *dev_priv) {struct intel_dp *intel_dp;
Wrong patch. Please ignore.
Quoted 3 lines
Signature · 1 line
2.13.5
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx