]> git.karo-electronics.de Git - karo-tx-linux.git/commit
drm/i915: Stop automatically retiring requests after a GPU hang
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 13 May 2016 10:57:22 +0000 (11:57 +0100)
committerJani Nikula <jani.nikula@intel.com>
Mon, 23 May 2016 13:21:32 +0000 (16:21 +0300)
commit157d2c7fad0863222f6f3b11c4690f2a6e74d809
treeefb3689c87bd6b77cf3818c357b91a04b37e9352
parent92dcc67c11d51671cca8df543e25c601e52336ad
drm/i915: Stop automatically retiring requests after a GPU hang

Following a GPU hang, we break out of the request loop in order to
unlock the struct_mutex for use by the GPU reset. However, if we retire
all the requests at that moment, we cannot identify the guilty request
after performing the reset.

v2: Not automatically retiring requests forces us to recheck for
available ringspace.

Fixes: f4457ae71fd6 ("drm/i915: Prevent leaking of -EIO from i915_wait_request()")
Testcase: igt/gem_reset_stats/ban-*
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Tested-by: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1463137042-9669-4-git-send-email-chris@chris-wilson.co.uk
(cherry picked from commit e075a32f515becef66dc849f5eca47409ccf5473)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_ringbuffer.c