From 6a3cc12fee96b2527d65fd47c8ac9b01c3207089 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 19 Apr 2011 23:21:12 +0100 Subject: [PATCH] --- yaml --- r: 250583 b: refs/heads/master c: 7a5e4805bda3c6420e96ca0626c3fa23dd281e96 h: refs/heads/master i: 250581: 457037ee08c16abd3c53721c96e86151c38b2d90 250579: 5caf6de456e650de8a66223dd411cba074f4155e 250575: 34806264745cb74b53f2b354b0b4d960c09b5601 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ccfa509fccf8..53c3108bdb83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8261b19173b89d86cc3088483595e2879e4976d6 +refs/heads/master: 7a5e4805bda3c6420e96ca0626c3fa23dd281e96 diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index 81c4f597cac0..dfa965ac3f30 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -5488,7 +5488,6 @@ bool intel_get_load_detect_pipe(struct intel_encoder *intel_encoder, { struct intel_crtc *intel_crtc; struct drm_crtc *possible_crtc; - struct drm_crtc *supported_crtc =NULL; struct drm_encoder *encoder = &intel_encoder->base; struct drm_crtc *crtc = NULL; struct drm_device *dev = encoder->dev; @@ -5498,12 +5497,12 @@ bool intel_get_load_detect_pipe(struct intel_encoder *intel_encoder, /* * Algorithm gets a little messy: + * * - if the connector already has an assigned crtc, use it (but make * sure it's on first) + * * - try to find the first unused crtc that can drive this connector, * and use that if we find one - * - if there are no unused crtcs available, try to use the first - * one we found that supports the connector */ /* 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, crtc = possible_crtc; break; } - if (!supported_crtc) - supported_crtc = possible_crtc; } /*