diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-03-30 16:14:05 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-01 06:32:32 -0400 |
commit | e77166b5a653728f312d07e60a80819d1c54fca4 (patch) | |
tree | 52c6517f27f31b2b2b216a08f1e8d0978ccf7456 /drivers/gpu/drm/i915/intel_display.c | |
parent | 1c7eaac737e4cca24703531ebcb566afc3ed285f (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-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 ec6ea92da538..91b35fd1db8c 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) | |||
5539 | if (intel_panel_use_ssc(dev_priv) && can_ssc) { | 5539 | if (intel_panel_use_ssc(dev_priv) && can_ssc) { |
5540 | DRM_DEBUG_KMS("Using SSC on panel\n"); | 5540 | DRM_DEBUG_KMS("Using SSC on panel\n"); |
5541 | temp |= DREF_SSC1_ENABLE; | 5541 | temp |= DREF_SSC1_ENABLE; |
5542 | } | 5542 | } else |
5543 | temp &= ~DREF_SSC1_ENABLE; | ||
5543 | 5544 | ||
5544 | /* Get SSC going before enabling the outputs */ | 5545 | /* Get SSC going before enabling the outputs */ |
5545 | I915_WRITE(PCH_DREF_CONTROL, temp); | 5546 | I915_WRITE(PCH_DREF_CONTROL, temp); |