---

yaml --- r: 298525 b: refs/heads/master c: e77166b h: refs/heads/master i: 298523: 0a31456 v: v3
git-mirror · Apr 1, 2012 · 14c7ee1 · 14c7ee1
1 parent eebe74f
commit 14c7ee1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c7eaac737e4cca24703531ebcb566afc3ed285f
+refs/heads/master: e77166b5a653728f312d07e60a80819d1c54fca4
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/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);