Commit 9c8eb2d5 authored by Chris Wilson's avatar Chris Wilson Committed by Rodrigo Vivi

drm/i915: Quietly cancel FBC activation if CRTC is turned off before worker

Since we use a worker to enable FBC on the CRTC, it is possible for the
CRTC to be switched off before we run. In this case, the CRTC will not
allow us to wait upon a vblank, so remove the DRM_ERROR as this is very
much expected.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102410
Fixes: ca18d51d ("drm/i915/fbc: wait for a vblank instead of 50ms when enabling")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170825150215.19236-1-chris@chris-wilson.co.ukReviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
(cherry picked from commit 908b6e6e)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 7846b12f
...@@ -406,9 +406,7 @@ static void intel_fbc_work_fn(struct work_struct *__work) ...@@ -406,9 +406,7 @@ static void intel_fbc_work_fn(struct work_struct *__work)
struct drm_vblank_crtc *vblank = &dev_priv->drm.vblank[crtc->pipe]; struct drm_vblank_crtc *vblank = &dev_priv->drm.vblank[crtc->pipe];
if (drm_crtc_vblank_get(&crtc->base)) { if (drm_crtc_vblank_get(&crtc->base)) {
DRM_ERROR("vblank not available for FBC on pipe %c\n", /* CRTC is now off, leave FBC deactivated */
pipe_name(crtc->pipe));
mutex_lock(&fbc->lock); mutex_lock(&fbc->lock);
work->scheduled = false; work->scheduled = false;
mutex_unlock(&fbc->lock); mutex_unlock(&fbc->lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment