Hi all, I took me a while to see the real issues Chris has been complaining about, but I think the reworked patches take them all into account now. The big change is that the wedged check at the beginning of intel_ring_begin stays, but gets improved by properly deciding betweein -EIO and -EAGAIN. I've checked all the callsites and couldn't find any issues. Comments, flames, reviews and testing reports highly welcome. I've also pushed the latest version of this to the reset-rework branch of my personal git repo. Cheers, Daniel Daniel Vetter (5): drm/i915: don't trylock in the gpu reset code drm/i915: non-interruptible sleeps can't handle -EGAIN drm/i915: don't hang userspace when the gpu reset is stuck drm/i915: properly SIGBUS on I/O errors drm/i915: don't return a spurious -EIO from intel_ring_begin drivers/gpu/drm/i915/i915_drv.c | 3 +-- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_gem.c | 44 ++++++++++++++++++++++++------- drivers/gpu/drm/i915/intel_ringbuffer.c | 24 ++++++----------- 4 files changed, 45 insertions(+), 28 deletions(-) -- 1.7.10
