The updated work is below, rebased on top of dinq. http://cgit.freedesktop.org/~bwidawsk/drm-intel/log/?h=wait_rendering git://people.freedesktop.org/~bwidawsk/drm-intel wait_rendering I'll resubmit the patches once we settle on the review comments from patch 1. Thanks Chris, and Daniel for the feedback so far. On Sun, 29 Apr 2012 15:22:29 -0700 Ben Widawsky <ben at bwidawsk.net> wrote: > 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(-) > -- Ben Widawsky, Intel Open Source Technology Center