]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
drm/i915: Restore nonblocking awaits for modesetting
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 28 Oct 2016 12:58:45 +0000 (13:58 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Fri, 28 Oct 2016 19:53:51 +0000 (20:53 +0100)
commitc004a90b7263e3d5811f6ec7de0abb143f3099b3
tree3c940122857dec26e7a9bf1730874838de1e3015
parentd07f0e59b2c762584478920cd2d11fba2980a94a
drm/i915: Restore nonblocking awaits for modesetting

After combining the dma-buf reservation object and the GEM reservation
object, we lost the ability to do a nonblocking wait on the i915 request
(as we blocked upon the reservation object during prepare_fb). We can
instead convert the reservation object into a fence upon which we can
asynchronously wait (including a forced timeout in case the DMA fence is
never signaled).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161028125858.23563-22-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h