From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 22 Sep 2010 12:15:10 +0000 (+0100)
Subject: drm/i915: Disable "disabled FBC" message when a no-op
X-Git-Tag: firefly_0821_release~7613^2~3600^2~31^2~53
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a5cad620b36f15ef3aad434712ae290640aae96c;p=firefly-linux-kernel-4.4.55.git

drm/i915: Disable "disabled FBC" message when a no-op

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---

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);