diff options
| author | Matthew Auld | 2016-07-05 11:28:34 +0200 |
|---|---|---|
| committer | Joonas Lahtinen | 2016-08-02 13:25:46 +0200 |
| commit | 4da456168f41499369bef5ebb33d5966cd9cbb8c (patch) | |
| tree | 2a26fdc83507a1778aad10348e730923ca3c287d /drivers/gpu/drm/i915/intel_fbc.c | |
| parent | drm/i915: Protect older gen against intel_gt_init_powersave() (diff) | |
| download | kernel-qcow2-linux-4da456168f41499369bef5ebb33d5966cd9cbb8c.tar.gz kernel-qcow2-linux-4da456168f41499369bef5ebb33d5966cd9cbb8c.tar.xz kernel-qcow2-linux-4da456168f41499369bef5ebb33d5966cd9cbb8c.zip | |
drm/i915: remove redundant fbc warnings
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
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fbc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_fbc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c index 781e2f5f7cd8..8147eb9e8475 100644 --- a/drivers/gpu/drm/i915/intel_fbc.c +++ b/drivers/gpu/drm/i915/intel_fbc.c @@ -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); |