drm/i915: remove redundant fbc warnings
authorMatthew Auld <matthew.auld@intel.com>
Tue, 5 Jul 2016 09:28:34 +0000 (10:28 +0100)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Tue, 2 Aug 2016 11:25:46 +0000 (14:25 +0300)
The fbc enabled/active sanity checks are already done in
__intel_fbc_disable so no need to do them again.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1467710914-15146-1-git-send-email-matthew.auld@intel.com
drivers/gpu/drm/i915/intel_fbc.c

index 781e2f5f7cd8addbce3e2285d231a8668057c9f5..8147eb9e8475278b81698ab5a02df6690ecbe65e 100644 (file)
@@ -1165,11 +1165,8 @@ void intel_fbc_disable(struct intel_crtc *crtc)
                return;
 
        mutex_lock(&fbc->lock);
-       if (fbc->crtc == crtc) {
-               WARN_ON(!fbc->enabled);
-               WARN_ON(fbc->active);
+       if (fbc->crtc == crtc)
                __intel_fbc_disable(dev_priv);
-       }
        mutex_unlock(&fbc->lock);
 
        cancel_work_sync(&fbc->work.work);