Revert "Revert "drm/i915: Mark the FB's bo as busy when we pageflip""

This reverts commit edf0e91c645c10f00f1fb3e5b86bac132d27d9e7.

We previously reverted it because we thought this might cause test
crashes, but it is not the case, so let's reland this change for
good.

BUG=chromium-os:37791
TEST=compiles, works on Alex.

Change-Id: I7dcf708ef5c601e463f10929b802d0682a8be853
Reviewed-on: https://gerrit.chromium.org/gerrit/41460
Tested-by: Stéphane Marchesin <marcheu@chromium.org>
Commit-Queue: Ilja H. Friedel <ihf@chromium.org>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Tested-by: Ilja H. Friedel <ihf@chromium.org>
Commit-Queue: Stéphane Marchesin <marcheu@chromium.org>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index db03d8db0dff2a35b08699927c8d8e2df36ef2d9..55a40334c27a1f53a9fb120e433759f0c9cd76dc 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7600,6 +7600,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
                goto cleanup_pending;
 
        intel_disable_fbc(dev);
+       intel_mark_busy(dev, intel_fb->obj);
        mutex_unlock(&dev->struct_mutex);
 
        trace_i915_flip_request(intel_crtc->plane, obj);