Skip to content

Commit

Permalink
drm/i915: Also disable PSR on Sink when disabling it on Source.
Browse files Browse the repository at this point in the history
It is not a bad idea to disable the PSR feature on Sink
when we are disabling on the Source.

v2: Move dpcd write inside mutex protected area as suggested by Sonika.

Cc: Sonika Jindal <sonika.jindal@intel.com>
Suggested-by: Sonika Jindal <sonika.jindal@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Sonika Jindal <sonika.jindal@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Rodrigo Vivi authored and Daniel Vetter committed Nov 24, 2015
1 parent 05eec3c commit b6e4d53
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/gpu/drm/i915/intel_psr.c
Original file line number Diff line number Diff line change
Expand Up @@ -524,11 +524,15 @@ void intel_psr_disable(struct intel_dp *intel_dp)
return;
}

/* Disable PSR on Source */
if (HAS_DDI(dev))
hsw_psr_disable(intel_dp);
else
vlv_psr_disable(intel_dp);

/* Disable PSR on Sink */
drm_dp_dpcd_writeb(&intel_dp->aux, DP_PSR_EN_CFG, 0);

dev_priv->psr.enabled = NULL;
mutex_unlock(&dev_priv->psr.lock);

Expand Down

0 comments on commit b6e4d53

Please sign in to comment.