summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorChris Wilson2010-09-22 14:15:10 +0200
committerChris Wilson2010-09-22 14:15:10 +0200
commita5cad620b36f15ef3aad434712ae290640aae96c (patch)
tree9d7e5d2c726d9bc5aba08f4f888f4bb5179bc674 /drivers/gpu/drm/i915/intel_display.c
parentdrm/i915: Drop ring->lazy_request (diff)
downloadkernel-qcow2-linux-a5cad620b36f15ef3aad434712ae290640aae96c.tar.gz
kernel-qcow2-linux-a5cad620b36f15ef3aad434712ae290640aae96c.tar.xz
kernel-qcow2-linux-a5cad620b36f15ef3aad434712ae290640aae96c.zip
drm/i915: Disable "disabled FBC" message when a no-op
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e6f7ebfe86e5..b92385498d2c 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/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);