| commit | 5bc40472dea771260dc6d6946fd09c1ac3c9cd93 | [log] [tgz] |
|---|---|---|
| author | Paulo Zanoni <paulo.r.zanoni@intel.com> | Tue Jan 19 11:35:53 2016 -0200 |
| committer | Paulo Zanoni <paulo.r.zanoni@intel.com> | Fri Jan 29 18:17:56 2016 -0200 |
| tree | 5ef8cc48cfaaba490f7da9d06a8a4dac70e9ee20 | |
| parent | 49227c4ae3d2c8ccb6c71bfb5dfac80ad8c73021 [diff] |
drm/i915/fbc: don't try to deactivate FBC if it's not enabled During FBC invalidation, don't call intel_fbc_deactivate if it's not enabled. This doesn't fix any bug, but helps making the interface saner. Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1453210558-7875-21-git-send-email-paulo.r.zanoni@intel.com
diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c index 912b953..2ed9be2 100644 --- a/drivers/gpu/drm/i915/intel_fbc.c +++ b/drivers/gpu/drm/i915/intel_fbc.c
@@ -982,7 +982,7 @@ fbc->busy_bits |= intel_fbc_get_frontbuffer_bit(fbc) & frontbuffer_bits; - if (fbc->busy_bits) + if (fbc->enabled && fbc->busy_bits) intel_fbc_deactivate(dev_priv); mutex_unlock(&fbc->lock);