summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-05-27 13:18:16 +0100
committerEric Anholt <eric@anholt.net>2010-05-28 10:43:14 -0700
commita939406fda8ddc7de69ee9186356d09dc6daaa2c (patch)
tree43f09a189c8ac38b67145b0e787eb916d741848b
parent808b24d6ed8b155aac17007788390ebfde263f30 (diff)
downloadlinux-a939406fda8ddc7de69ee9186356d09dc6daaa2c.tar.gz
linux-a939406fda8ddc7de69ee9186356d09dc6daaa2c.tar.bz2
linux-a939406fda8ddc7de69ee9186356d09dc6daaa2c.zip
drm/i915: Only print "nothing to do" debug message as required.
If the FBC is already disabled, then we do not even attempt to disable FBC and so there is no point emitting a debug statement at that point, having already emitted one saying why we are disabling FBC. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 1845a068cca5..e504fdb4ae31 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1248,10 +1248,11 @@ static void intel_update_fbc(struct drm_crtc *crtc,
return;
out_disable:
- DRM_DEBUG_KMS("unsupported config, disabling FBC\n");
/* Multiple disables should be harmless */
- if (intel_fbc_enabled(dev))
+ if (intel_fbc_enabled(dev)) {
+ DRM_DEBUG_KMS("unsupported config, disabling FBC\n");
intel_disable_fbc(dev);
+ }
}
static int