diff options
| author | Imre Deak <imre.deak@intel.com> | 2014-08-18 14:42:46 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2014-08-18 16:51:35 +0300 |
| commit | 1a125d8a2c22b11741fc47d4ffcf7a5ffa044dd3 (patch) | |
| tree | d08ee1747c76cfbb5958203cef27500469677821 /drivers | |
| parent | 07f9cd0b3870e306ddc5abcc3af2d748c9bd378c (diff) | |
| download | linux-1a125d8a2c22b11741fc47d4ffcf7a5ffa044dd3.tar.bz2 | |
drm/i915: don't try to retrain a DP link on an inactive CRTC
Atm we may retrain the DP link even if the CRTC is inactive through
HPD work->intel_dp_check_link_status(). This in turn can lock up the PHY
(at least on BYT), since the DP port is disabled.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81948
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: stable@vger.kernel.org (3.16+)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 39b643163846..67cfed6d911a 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -3553,6 +3553,9 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) if (WARN_ON(!intel_encoder->base.crtc)) return; + if (!to_intel_crtc(intel_encoder->base.crtc)->active) + return; + /* Try to read receiver status if the link appears to be up */ if (!intel_dp_get_link_status(intel_dp, link_status)) { return; |