diff options
| author | Carl Worth <cworth@cworth.org> | 2010-05-17 09:46:05 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-06-02 14:33:30 -0700 |
| commit | 0d7168bcf45fa5b6307726091ea77fd4ab16d1ab (patch) | |
| tree | 3e05f1e1b16a25d0e5a8e32be7909305e1a49cba | |
| parent | aef4b9aaae1decc775778903922bd0075cce7a88 (diff) | |
| download | kernel-crypto-0d7168bcf45fa5b6307726091ea77fd4ab16d1ab.tar.gz kernel-crypto-0d7168bcf45fa5b6307726091ea77fd4ab16d1ab.tar.xz kernel-crypto-0d7168bcf45fa5b6307726091ea77fd4ab16d1ab.zip | |
Revert "drm/i915: Don't enable pipe/plane/VCO early (wait for DPMS on)."
This reverts commit cfecde435dda78248d6fcdc424bed68d5db6be0b.
The commit was first created as an attempt to fix LVDS initialiazation
on Ironlake. Testing revealed that it didn't fix that, but it was
assumed to still be correct anyway.
Subsequent testing has revealed that this commit has caused other
regressions:
* Change in VBlank interrupt frequency causing 60% 3D performance regression
http://bugs.freedesktop.org/show_bug.cgi?id=27698
* Black screen on G45
http://bugs.freedesktop.org/show_bug.cgi?id=27733
So revert this buggy code for now to revisit later when we can fix
actual bugs without causing these regressions.
Signed-off-by: Carl Worth <cworth@cworth.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 88a1ab7c05c..b40155fe512 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/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); |