---

yaml --- r: 288084 b: refs/heads/master c: aed3f09 h: refs/heads/master v: v3
git-mirror · Feb 24, 2012 · cb5b563 · cb5b563
1 parent 34f9509
commit cb5b563
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0e2ee1bc0cf82eec89e26b7afe7e4db0561b7d9
+refs/heads/master: aed3f09db39596e539f90b11a5016aea4d8442e1
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -6184,7 +6184,7 @@ void intel_crtc_load_lut(struct drm_crtc *crtc)
 	int i;
 
 	/* The clocks have to be on to load the palette. */
-	if (!crtc->enabled)
+	if (!crtc->enabled || !intel_crtc->active)
 		return;
 
 	/* use legacy palette for Ironlake */