diff --git a/[refs] b/[refs]
index 74a43efbb351..6eaa59334219 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c12a07e8073295ce8b57a822f811ac34e4f8420
+refs/heads/master: a5cad620b36f15ef3aad434712ae290640aae96c
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
index e6f7ebfe86e5..b92385498d2c 100644
--- a/trunk/drivers/gpu/drm/i915/intel_display.c
+++ b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -1110,6 +1110,9 @@ void i8xx_disable_fbc(struct drm_device *dev)
 
 	/* Disable compression */
 	fbc_ctl = I915_READ(FBC_CONTROL);
+	if ((fbc_ctl & FBC_CTL_EN) == 0)
+		return;
+
 	fbc_ctl &= ~FBC_CTL_EN;
 	I915_WRITE(FBC_CONTROL, fbc_ctl);