drm/i915: add the FBC mutex

[mirror_ubuntu-zesty-kernel.git] / drivers / gpu / drm / i915 / intel_display.c

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 136b533718786c258e46d4b980730752e99c7afd..93d3bdf242a94c9678c0152df83fc3d8661f1fe4 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4783,11 +4783,9 @@ static void intel_pre_plane_update(struct intel_crtc *crtc)
        if (atomic->wait_for_flips)
                intel_crtc_wait_for_pending_flips(&crtc->base);
 
-       if (atomic->disable_fbc &&
-           dev_priv->fbc.crtc == crtc) {
+       if (atomic->disable_fbc) {
                mutex_lock(&dev->struct_mutex);
-               if (dev_priv->fbc.crtc == crtc)
-                       intel_fbc_disable(dev);
+               intel_fbc_disable_crtc(crtc);
                mutex_unlock(&dev->struct_mutex);
        }