From 73019a1e6521a0887736359398632d998adba931 Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Thu, 20 Sep 2012 18:36:06 -0300 Subject: [PATCH] --- yaml --- r: 345071 b: refs/heads/master c: e2f12b070d715315f0ed549fe8d722b681518c1b h: refs/heads/master i: 345069: ffc49dbf04971b407d318b64a936b8ff1b62019c 345067: 3c57fd44c72fef1939b8dc9378be416976fedce4 345063: 86c4adc5cb312c27ca5dbd9598ecb65d2437ed13 345055: 0b721b4e7c365b387b5a6f167e4ac5c5ab005986 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 21 +++------------------ 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 0a61b5ddda82..bdbfef5628ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de13a2e3f88a4da8e85063b6de37096795079e41 +refs/heads/master: e2f12b070d715315f0ed549fe8d722b681518c1b diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index c7fa2a82c84a..08c3f69bfc75 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -4900,39 +4900,24 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, int num_connectors = 0; intel_clock_t clock, reduced_clock; u32 dpll, fp = 0, fp2 = 0; - bool ok, has_reduced_clock = false, is_sdvo = false; - bool is_crt = false, is_lvds = false, is_tv = false, is_dp = false; + bool ok, has_reduced_clock = false; + bool is_lvds = false, is_dp = false, is_cpu_edp = false; struct intel_encoder *encoder; u32 temp; int ret; bool dither; - bool is_cpu_edp = false, is_pch_edp = false; for_each_encoder_on_crtc(dev, crtc, encoder) { switch (encoder->type) { case INTEL_OUTPUT_LVDS: is_lvds = true; break; - case INTEL_OUTPUT_SDVO: - case INTEL_OUTPUT_HDMI: - is_sdvo = true; - if (encoder->needs_tv_clock) - is_tv = true; - break; - case INTEL_OUTPUT_TVOUT: - is_tv = true; - break; - case INTEL_OUTPUT_ANALOG: - is_crt = true; - break; case INTEL_OUTPUT_DISPLAYPORT: is_dp = true; break; case INTEL_OUTPUT_EDP: is_dp = true; - if (intel_encoder_is_pch_edp(&encoder->base)) - is_pch_edp = true; - else + if (!intel_encoder_is_pch_edp(&encoder->base)) is_cpu_edp = true; break; }