]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
drm/i915: Report an error when i915.reset prevents a reset
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 18 Jun 2015 10:42:08 +0000 (11:42 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 23 Jun 2015 12:01:38 +0000 (14:01 +0200)
commitb1330fbb870467bbb90adb2e8868672af4ca88c7
tree26dade4170a4b26bb8a114791676c78b0e8fc0f9
parentbf13af56252b2b4f50eb6fc8638e8cb9e84ff475
drm/i915: Report an error when i915.reset prevents a reset

If the user disables the GPU reset using the i915.reset parameter and
one occurs, report that we failed to reset the GPU. If we return early,
as we currently do, then we leave all state intact (with a hung GPU)
and clients block forever waiting for their requests to complete.

Testcase: igt/gem_eio
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
[danvet: Mark i915.reset as an unsafe modoption, as discussed with
Chris.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_params.c
drivers/gpu/drm/i915/intel_uncore.c