diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-03-30 22:14:05 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-01 12:32:32 +0200 |
| commit | e77166b5a653728f312d07e60a80819d1c54fca4 (patch) | |
| tree | 52c6517f27f31b2b2b216a08f1e8d0978ccf7456 | |
| parent | 1c7eaac737e4cca24703531ebcb566afc3ed285f (diff) | |
| download | linux-3.10-e77166b5a653728f312d07e60a80819d1c54fca4.tar.gz linux-3.10-e77166b5a653728f312d07e60a80819d1c54fca4.tar.bz2 linux-3.10-e77166b5a653728f312d07e60a80819d1c54fca4.zip | |
drm/i915: properly clear SSC1 bit in the pch refclock init code
Noticed by staring at intel_reg_dumper diffs. Unfortunately it does
not seem to completely fix the bug.
Still, it's good to get this right, and maybe it helps someplace else.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47117
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index ec6ea92da53..91b35fd1db8 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5539,7 +5539,8 @@ void ironlake_init_pch_refclk(struct drm_device *dev) if (intel_panel_use_ssc(dev_priv) && can_ssc) { DRM_DEBUG_KMS("Using SSC on panel\n"); temp |= DREF_SSC1_ENABLE; - } + } else + temp &= ~DREF_SSC1_ENABLE; /* Get SSC going before enabling the outputs */ I915_WRITE(PCH_DREF_CONTROL, temp); |