]> asedeno.scripts.mit.edu Git - linux.git/commit
drm/i915: Quietly cancel FBC activation if CRTC is turned off before worker
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 25 Aug 2017 15:02:15 +0000 (16:02 +0100)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Wed, 30 Aug 2017 19:08:07 +0000 (12:08 -0700)
commit9c8eb2d5cbdb8a97a0b2a4da2825a2c4c0a202dc
tree52e25452f3e260a6ac4bc6a60e8c92465c8ce07b
parent7846b12fe0b5feab5446d892f41b5140c1419109
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: ca18d51d77eb ("drm/i915/fbc: wait for a vblank instead of 50ms when enabling")
Signed-off-by: Chris 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.uk
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
(cherry picked from commit 908b6e6e8ab4c1e0c3783be4c4b437ac6fa374ea)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/intel_fbc.c