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

Previously, the page flipping case wasn't accounted for, only front buffer
rendering. This change adds a hook from the page flip code to update the
busyness of the crtc in the page flip case.

BUG=chromium-os:37277
TEST=by hand

Change-Id: Iebf826e3dc073579ca1446d7b70bcbf06d7bba5d
Reviewed-on: https://gerrit.chromium.org/gerrit/40355
Tested-by: Jonathan Backer <backer@chromium.org>
Reviewed-by: Chris Wolfe <cwolfe@chromium.org>
Commit-Queue: Stéphane Marchesin <marcheu@chromium.org>
Tested-by: 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 db03d8d..55a4033 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);