On Tue, Apr 29, 2014 at 02:52:27PM -0700, Ben Widawsky wrote: > Okay, trying this again after the somewhat painful VCS2 rebase. I think I got > to all of Ville's comments, but I could have missed a few. I apologize if so. > > Daniel, even if you don't merge the whole series, the first few would really > help rebase pain - though now that VCS2 is merged, there's probably not much > other than execlists to be painful > > The series is completely untested since the last rebase. I also didn't look > really closely to make sure the rebase was correct - I'm just totally short on > time atm. It was tested before that. I think it looks all right, but I must admit to my eyes glazing over when looking at the ring->semaphore... init parts. I don't really like the GEN8_RING_SEMAPHORE_INIT macro. Not sure why it's not a simple static function. But anyway I think you can slap on Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> for patches 1-7 and 10-11 if they didn't have it already. I left out the poll patch since it shouldn't be needed for production hw AFAICS (I guess we can merge it if we add a comment there that we should try to remove it once the early hardware is sufficiently phased out). The force restore patch doesn't seem applicable for ring buffer mode, and I didn't really look at the debugfs patch so far. The missing bits seem to be one or two workarounds and the semaphore_wait_to_signaller_ring() thing for which I tried to cobble together something in my reply. > > Ben Widawsky (13): > drm/i915: Move semaphore specific ring members to struct > drm/i915: Virtualize the ringbuffer signal func > drm/i915: Move ring_begin to signal() > drm/i915: Make semaphore updates more precise > drm/i915: gen specific ring init > drm/i915/bdw: implement semaphore signal > drm/i915/bdw: implement semaphore wait > drm/i915: Implement MI decode for gen8 > drm/i915/bdw: poll semaphores > drm/i915: Extract semaphore error collection > drm/i915/bdw: collect semaphore error state > drm/i915: semaphore debugfs > DONT_MERGE drm/i915: FORCE_RESTORE for gen8 semaphores > > drivers/gpu/drm/i915/i915_debugfs.c | 70 ++++++ > drivers/gpu/drm/i915/i915_drv.h | 2 + > drivers/gpu/drm/i915/i915_gem.c | 10 +- > drivers/gpu/drm/i915/i915_gem_context.c | 7 + > drivers/gpu/drm/i915/i915_gpu_error.c | 79 +++++-- > drivers/gpu/drm/i915/i915_irq.c | 14 +- > drivers/gpu/drm/i915/i915_reg.h | 8 +- > drivers/gpu/drm/i915/intel_ringbuffer.c | 405 ++++++++++++++++++++++---------- > drivers/gpu/drm/i915/intel_ringbuffer.h | 90 ++++++- > 9 files changed, 528 insertions(+), 157 deletions(-) > > -- > 1.9.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
