Hopefully addressed all the comments from the first series. Tests and sample libdrm remain in the same place. Much thanks to Chris Wilson on helping me smash this into shape. Ben Widawsky (12): drm/i915: remove do_retire from i915_wait_request drm/i915: remove some extra retiring drm/i915: move vbetool invoked ier stuff drm/i915: kill waiting_seqno drm/i915: drop polled waits from i915_wait_request drm/i915: extract __wait_seqno from i915_wait_request drm/i915: remove polled wait from throttle drm/i915: use __wait_seqno for ring throttle drm/i915: timeout parameter for seqno wait drm/i915: extract some common olr+wedge code drm/i915: wait render timeout ioctl drm/i915: s/i915_wait_reqest/i915_wait_seqno/g drivers/gpu/drm/i915/i915_debugfs.c | 4 +- drivers/gpu/drm/i915/i915_dma.c | 3 +- drivers/gpu/drm/i915/i915_drv.h | 11 +- drivers/gpu/drm/i915/i915_gem.c | 295 +++++++++++++++++----------- drivers/gpu/drm/i915/i915_gem_evict.c | 15 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 21 +- drivers/gpu/drm/i915/intel_overlay.c | 6 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 4 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 1 - include/drm/i915_drm.h | 8 + 12 files changed, 230 insertions(+), 142 deletions(-) -- 1.7.10