aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Vivi <rodrigo.vivi@intel.com>2015-11-23 17:19:32 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-11-24 07:33:50 -0500
commitb6e4d53490504ee43a765e71a8fd8337af137623 (patch)
tree643aec34611a5256a80910d1c7bd3cbe621eeeb8
parent05eec3c2709d8966cbfcc7cd395f37889c492678 (diff)
drm/i915: Also disable PSR on Sink when disabling it on Source.
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>
-rw-r--r--drivers/gpu/drm/i915/intel_psr.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index a02dd3015b91..b6609e648f75 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -524,11 +524,15 @@ void intel_psr_disable(struct intel_dp *intel_dp)
524 return; 524 return;
525 } 525 }
526 526
527 /* Disable PSR on Source */
527 if (HAS_DDI(dev)) 528 if (HAS_DDI(dev))
528 hsw_psr_disable(intel_dp); 529 hsw_psr_disable(intel_dp);
529 else 530 else
530 vlv_psr_disable(intel_dp); 531 vlv_psr_disable(intel_dp);
531 532
533 /* Disable PSR on Sink */
534 drm_dp_dpcd_writeb(&intel_dp->aux, DP_PSR_EN_CFG, 0);
535
532 dev_priv->psr.enabled = NULL; 536 dev_priv->psr.enabled = NULL;
533 mutex_unlock(&dev_priv->psr.lock); 537 mutex_unlock(&dev_priv->psr.lock);
534 538