aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorImre Deak <imre.deak@intel.com>2014-01-17 08:46:43 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-01-22 04:34:39 -0500
commit2e82a7203182d0883d0f9450d40ad6e1c6578ad9 (patch)
tree58beb631dc3ae135c4d78472ba2259e948f911b1 /drivers/gpu
parent5d6a1116c6475404e6505b708320f9579ae19acd (diff)
drm/i915: don't disable DP port after a failed link training
Atm after a failed link training we disable the DP port. This can happen during a modeset-enable or a DP link re-establishment. The latter can be a problem and we shouldn't disable the DP port, see the previous patch for the reasoning. In the former case the right thing would be to disable the DP port, but also the rest of the pipe. As a stop-gap solution leave the DP port enabled in both cases. It is an improvement on its own (avoiding HW lock ups) and the proper solution for the first case requires a bigger change, so let's keep that on the TODO list. v2: - fix explanation of change impact (Chris) Suggested-by: Daniel Vetter <daniel@ffwll.ch> Signed-off-by: Imre Deak <imre.deak@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 7b630e9a0115..689b832f7551 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -2638,7 +2638,6 @@ intel_dp_complete_link_train(struct intel_dp *intel_dp)
2638 2638
2639 if (cr_tries > 5) { 2639 if (cr_tries > 5) {
2640 DRM_ERROR("failed to train DP, aborting\n"); 2640 DRM_ERROR("failed to train DP, aborting\n");
2641 intel_dp_link_down(intel_dp);
2642 break; 2641 break;
2643 } 2642 }
2644 2643