From 50c598cd8b9945fd0da7949eaeba7994171ba531 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 8 Jun 2010 20:16:28 -0700 Subject: [PATCH] --- yaml --- r: 200246 b: refs/heads/master c: 8d86dc6a5bcd0f1d5b9364d43843f1bb4b15f57a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4612dbf9bc23..8ee5a1637adc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5c98a40947af7e8226fff584151c9ce6eaed03b +refs/heads/master: 8d86dc6a5bcd0f1d5b9364d43843f1bb4b15f57a diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index 2861da3aaf7e..cc8131ff319f 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -3653,6 +3653,11 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, pipeconf &= ~PIPEACONF_DOUBLE_WIDE; } + dspcntr |= DISPLAY_PLANE_ENABLE; + pipeconf |= PIPEACONF_ENABLE; + dpll |= DPLL_VCO_ENABLE; + + /* Disable the panel fitter if it was on our pipe */ if (!HAS_PCH_SPLIT(dev) && intel_panel_fitter_pipe(dev) == pipe) I915_WRITE(PFIT_CONTROL, 0);