aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 81c4f597cac0..dfa965ac3f30 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5488,7 +5488,6 @@ bool intel_get_load_detect_pipe(struct intel_encoder *intel_encoder,
5488{ 5488{
5489 struct intel_crtc *intel_crtc; 5489 struct intel_crtc *intel_crtc;
5490 struct drm_crtc *possible_crtc; 5490 struct drm_crtc *possible_crtc;
5491 struct drm_crtc *supported_crtc =NULL;
5492 struct drm_encoder *encoder = &intel_encoder->base; 5491 struct drm_encoder *encoder = &intel_encoder->base;
5493 struct drm_crtc *crtc = NULL; 5492 struct drm_crtc *crtc = NULL;
5494 struct drm_device *dev = encoder->dev; 5493 struct drm_device *dev = encoder->dev;
@@ -5498,12 +5497,12 @@ bool intel_get_load_detect_pipe(struct intel_encoder *intel_encoder,
5498 5497
5499 /* 5498 /*
5500 * Algorithm gets a little messy: 5499 * Algorithm gets a little messy:
5500 *
5501 * - if the connector already has an assigned crtc, use it (but make 5501 * - if the connector already has an assigned crtc, use it (but make
5502 * sure it's on first) 5502 * sure it's on first)
5503 *
5503 * - try to find the first unused crtc that can drive this connector, 5504 * - try to find the first unused crtc that can drive this connector,
5504 * and use that if we find one 5505 * and use that if we find one
5505 * - if there are no unused crtcs available, try to use the first
5506 * one we found that supports the connector
5507 */ 5506 */
5508 5507
5509 /* See if we already have a CRTC for this connector */ 5508 /* See if we already have a CRTC for this connector */
@@ -5533,8 +5532,6 @@ bool intel_get_load_detect_pipe(struct intel_encoder *intel_encoder,
5533 crtc = possible_crtc; 5532 crtc = possible_crtc;
5534 break; 5533 break;
5535 } 5534 }
5536 if (!supported_crtc)
5537 supported_crtc = possible_crtc;
5538 } 5535 }
5539 5536
5540 /* 5537 /*