This adds the fixes to the patches which Daniel didn't already take. New patch to update trace events is here as well, otherwise they're pretty much just cleanups and bug fixes from the previous try. Ben Widawsky (5): drm/i915: timeout parameter for seqno wait drm/i915: make waiting trace events more useful 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_dma.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 6 +- drivers/gpu/drm/i915/i915_gem.c | 260 ++++++++++++++++++++++--------- drivers/gpu/drm/i915/i915_trace.h | 45 +++++- drivers/gpu/drm/i915/intel_overlay.c | 4 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- include/drm/i915_drm.h | 8 + 7 files changed, 238 insertions(+), 88 deletions(-) -- 1.7.10
