aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_crt.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/intel_crt.c')
-rw-r--r--drivers/gpu/drm/i915/intel_crt.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index c42b9809f86d..ae3a3d545ef2 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -220,20 +220,7 @@ static void intel_crt_mode_set(struct drm_encoder *encoder,
220 intel_encoder_to_crt(to_intel_encoder(encoder)); 220 intel_encoder_to_crt(to_intel_encoder(encoder));
221 struct intel_crtc *intel_crtc = to_intel_crtc(crtc); 221 struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
222 struct drm_i915_private *dev_priv = dev->dev_private; 222 struct drm_i915_private *dev_priv = dev->dev_private;
223 int dpll_md_reg; 223 u32 adpa;
224 u32 adpa, dpll_md;
225
226 dpll_md_reg = DPLL_MD(intel_crtc->pipe);
227
228 /*
229 * Disable separate mode multiplier used when cloning SDVO to CRT
230 * XXX this needs to be adjusted when we really are cloning
231 */
232 if (INTEL_INFO(dev)->gen >= 4 && !HAS_PCH_SPLIT(dev)) {
233 dpll_md = I915_READ(dpll_md_reg);
234 I915_WRITE(dpll_md_reg,
235 dpll_md & ~DPLL_MD_UDI_MULTIPLIER_MASK);
236 }
237 224
238 adpa = ADPA_HOTPLUG_BITS; 225 adpa = ADPA_HOTPLUG_BITS;
239 if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC) 226 if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC)