---

yaml --- r: 209754 b: refs/heads/master c: ce17178 h: refs/heads/master v: v3
git-mirror · Aug 9, 2010 · b159e54 · b159e54
1 parent 2398319
commit b159e54
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8545423a912cf500009cbadfae57f706cf2b28e8
+refs/heads/master: ce17178094f368d9e3f39b2cb4303da5ed633dd4
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -5753,7 +5753,8 @@ void intel_init_clock_gating(struct drm_device *dev)
 				   ILK_DPFC_DIS2 |
 				   ILK_CLK_FBC);
 		}
-		return;
+		if (IS_GEN6(dev))
+			return;
 	} else if (IS_G4X(dev)) {
 		uint32_t dspclk_gate;
 		I915_WRITE(RENCLK_GATE_D1, 0);
@@ -5814,9 +5815,11 @@ void intel_init_clock_gating(struct drm_device *dev)
 				OUT_RING(MI_FLUSH);
 				ADVANCE_LP_RING();
 			}
-		} else
+		} else {
 			DRM_DEBUG_KMS("Failed to allocate render context."
-				       "Disable RC6\n");
+				      "Disable RC6\n");
+			return;
+		}
 	}
 
 	if (I915_HAS_RC6(dev) && drm_core_check_feature(dev, DRIVER_MODESET)) {