]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
drm/i915: Split GEM resetting into 3 phases
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 13 Mar 2017 16:59:57 +0000 (16:59 +0000)
committerJani Nikula <jani.nikula@intel.com>
Tue, 14 Mar 2017 10:11:49 +0000 (12:11 +0200)
commitda9a796f5475b4d3a339083af719982b7ab4a12b
tree0a41ff7b3737d8a5a2ed39a853fc47119481d944
parent6aef660370a9c246956ba6d01eebd8063c4214cb
drm/i915: Split GEM resetting into 3 phases

Currently we do a reset prepare/finish around the call to reset the GPU,
but it looks like we need a later stage after the hw has been
reinitialised to allow GEM to restart itself. Start by splitting the 2
GEM phases into 3:

  prepare - before the reset, check if GEM recovered, then stop GEM

  reset - after the reset, update GEM bookkeeping

  finish - after the re-initialisation following the reset, restart GEM

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170208143033.11651-2-chris@chris-wilson.co.uk
Link: http://patchwork.freedesktop.org/patch/msgid/20170313165958.13970-1-chris@chris-wilson.co.uk
(cherry picked from commit d80270931314a88d79d9bd5e0a5df93c12196375)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c