drm/i915: Dumb down the semaphore logic
Subsystems (2)
PATCH v2 1/2 drm/i915: Dumb down the semaphore logic
While I think the previous code is correct, it was hard to follow and hard to debug. Since we already have a ring abstraction, might as well use it to handle the semaphore updates and compares.
I don't expect this code to make semaphores better or worse, but you never know...
v2: Noting special
* Took Keith's suggestions in.
* Tried to take Daniel's suggestion in, but the change got too intrusive for
* this supposedly simple cleanup
* Ran Daniel's gem_ring_sync_loop test on this
--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 +- drivers/gpu/drm/i915/i915_reg.h | 13 ++ drivers/gpu/drm/i915/intel_ringbuffer.c | 171 +++++++++++++++++++++------- drivers/gpu/drm/i915/intel_ringbuffer.h | 7 +- 4 files changed, 148 insertions(+), 46 deletions(-)
drivers/gpu/drm/i915/i915_gem_execbuffer.c +2 -1
@@ -784,7 +784,8 @@ i915_gem_execbuffer_sync_rings(struct drm_i915_gem_object *obj, } from->sync_seqno[idx] = seqno; -return intel_ring_sync (to, from, seqno -1 ); + +return to->sync_to (to, from, seqno -1 ); } static int
drivers/gpu/drm/i915/i915_reg.h +13 -0
@@ -194,6 +194,13 @@#define MI_SEMAPHORE_UPDATE (1<<21)#define MI_SEMAPHORE_COMPARE (1<<20)#define MI_SEMAPHORE_REGISTER (1<<18) +#define MI_SEMAPHORE_SYNC_RV (2<<16) +#define MI_SEMAPHORE_SYNC_RB (0<<16) +#define MI_SEMAPHORE_SYNC_VR (0<<16) +#define MI_SEMAPHORE_SYNC_VB (2<<16) +#define MI_SEMAPHORE_SYNC_BR (2<<16) +#define MI_SEMAPHORE_SYNC_BV (0<<16) +#define MI_SEMAPHORE_SYNC_INVALID (1<<0)/* * 3D instructions used by the kernel */
@@ -296,6 +303,12 @@#define RING_CTL (base) ((base)+0x3c)#define RING_SYNC_0 (base) ((base)+0x40)#define RING_SYNC_1 (base) ((base)+0x44) +#define RVSYNC (RING_SYNC_0(dev_priv->ring[RCS].mmio_base)) +#define RBSYNC (RING_SYNC_1(dev_priv->ring[RCS].mmio_base)) +#define VRSYNC (RING_SYNC_1(dev_priv->ring[VCS].mmio_base)) +#define VBSYNC (RING_SYNC_0(dev_priv->ring[VCS].mmio_base)) +#define BRSYNC (RING_SYNC_0(dev_priv->ring[BCS].mmio_base)) +#define BVSYNC (RING_SYNC_1(dev_priv->ring[BCS].mmio_base))#define RING_MAX_IDLE (base) ((base)+0x54)#define RING_HWS_PGA (base) ((base)+0x80)#define RING_HWS_PGA_GEN6 (base) ((base)+0x2080)
drivers/gpu/drm/i915/intel_ringbuffer.c +129 -42
248 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +4 -3
@@ -75,7 +75,11 @@ struct intel_ring_buffer {int (*dispatch_execbuffer)(struct intel_ring_buffer *ring,u32 offset,u32 length);void (*cleanup)(struct intel_ring_buffer *ring); +int (*sync_to)(struct intel_ring_buffer *ring, +struct intel_ring_buffer *to, +u32 seqno); +u32 semaphore_register[3 ];/** * List of objects currently involved in rendering from the * ringbuffer.
@@ -180,9 +184,6 @@ static inline void intel_ring_emit(struct intel_ring_buffer *ring,void intel_ring_advance (struct intel_ring_buffer *ring);u32 intel_ring_get_seqno (struct intel_ring_buffer *ring); -int intel_ring_sync (struct intel_ring_buffer *ring, -struct intel_ring_buffer *to, -u32 seqno);int intel_init_render_ring_buffer (struct drm_device *dev);int intel_init_bsd_ring_buffer (struct drm_device *dev);
Signature · 1 line
1.7.6.1
PATCH v2 2/2 drm/i915: tracepoints for semaphores
The tracepoints give enough info to figure the updates and compares (document terminology for signals and waits) and dependencies therein of the semaphore mailboxes.
Here are arguments to perf to get interesting info (mostly copied from
Chris):
record -f -g -c 1 -e i915:intel_ringbuffer_add_request -e i915:intel_ringbuffer_consume_semaphore -a
--- drivers/gpu/drm/i915/i915_trace.h | 61 +++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 4 ++ 2 files changed, 65 insertions(+), 0 deletions(-)
drivers/gpu/drm/i915/i915_trace.h +61 -0
@@ -410,6 +410,67 @@ TRACE_EVENT(i915_reg_rw, (u32)(__entry->val >> 32)) ); +#define SEMAPHORE_REG_NAME (x) (\ + (x == RENDER_RING_BASE + 0x40) ? ("RVSYNC") : \ + ((x == RENDER_RING_BASE + 0x44) ? ("RBSYNC") : \ + ((x == GEN6_BSD_RING_BASE + 0x40) ? ("VRSYNC") : \ + ((x == GEN6_BSD_RING_BASE + 0x44) ? ("VBSYNC") : \ + ((x == BLT_RING_BASE + 0x40) ? ("BVSYNC") : \ + ((x == BLT_RING_BASE + 0x44) ? ("BRSYNC") : \ + ("UNKNOWN"))))))) + +#define RING_NAME (x) (\ + (x == 1) ? ("rcs") : \ + ((x == 2) ? ("vcs") : \ + ((x == 4) ? ("bcs") : \ + ("unk")))) + +TRACE_EVENT (intel_ringbuffer_add_request, + TP_PROTO(struct intel_ring_buffer *ring, + u32 seqno, + u32 reg1, + u32 reg2), +TP_ARGS (ring, seqno, reg1, reg2), +TP_STRUCT__entry ( + __field(int, id) + __field(u32, seqno) + __field(u32, reg1) +__field (u32, reg2) + ), +TP_fast_assign ( + __entry->id = ring->id; + __entry->seqno = seqno; + __entry->reg1 = reg1; + __entry->reg2 = reg2; + ), +TP_printk ("ring = %s, seqno = %u, signal mbox 1 = %s, signal mbox 2 = %s" , +RING_NAME (__entry->id), __entry->seqno, +SEMAPHORE_REG_NAME (__entry->reg1), +SEMAPHORE_REG_NAME (__entry->reg2)) +); + +TRACE_EVENT (intel_ringbuffer_consume_semaphore, + TP_PROTO(struct intel_ring_buffer *updater, + struct intel_ring_buffer *comparer, + u32 seqno), +TP_ARGS (updater, comparer, seqno), +TP_STRUCT__entry ( + __field(int, src) + __field(int, dest) +__field (u32, seqno) + ), +TP_fast_assign ( + __entry->src = updater->id; + __entry->dest = comparer->id; + __entry->seqno = seqno; + ), +/* It's not easy to macro the consuming mbox register */ +TP_printk ("signaller = %s, waiter = %s, seqno = %u" , +RING_NAME (__entry->src), +RING_NAME (__entry->dest), + __entry->seqno) +); +#endif /* _I915_TRACE_H_ */ /* This part must be outside protection */
drivers/gpu/drm/i915/intel_ringbuffer.c +4 -0
@@ -359,6 +359,8 @@ gen6_add_request(struct intel_ring_buffer *ring,intel_ring_emit (ring,MI_USER_INTERRUPT );intel_ring_advance (ring); +trace_intel_ringbuffer_add_request (ring, seqno, mbox1_reg, mbox2_reg); +return seqno; }
@@ -419,6 +421,8 @@ intel_ring_sync(struct intel_ring_buffer *waiter,intel_ring_emit (waiter,MI_NOOP );intel_ring_advance (waiter); +trace_intel_ringbuffer_consume_semaphore (signaller, waiter, seqno); +return 0 ; }
Signature · 1 line
1.7.6.1
Quoted 27 lines · Ben Widawsky
drivers/gpu/drm/i915/intel_ringbuffer.c +14
-4-static int +/** +* gen6_add_request - Update the semaphore mailbox registers +* +* @ring - ring that is adding a request +* @mbox1_reg - mailbox address for RCS or VCS ring +* @mbox2_reg - mailbox address for VCS or BCS ring +* +* Update the mailbox registers in the *other* rings with the current seqno. +* This acts like a signal in the canonical semaphore. +*/ +static u32 gen6_add_request (struct intel_ring_buffer *ring, -u32 *result) +u32 mbox1_reg, +u32 mbox2_reg) {u32 seqno;int ret;@@ -351,43 +350,119 @@ gen6_add_request(struct intel_ring_buffer *ring,return ret; seqno =i915_gem_get_seqno (ring->dev); -update_semaphore (ring,0 , seqno); -update_semaphore (ring,1 , seqno); +update_mboxes (ring, seqno, mbox1_reg);
drivers/gpu/drm/i915/intel_ringbuffer.c gen6_add_request(struct intel_ring_buffer *ring, · line 363
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +3
-1+update_mboxes (ring, seqno, mbox2_reg);intel_ring_emit (ring,MI_STORE_DWORD_INDEX );intel_ring_emit (ring,I915_GEM_HWS_INDEX <<MI_STORE_DWORD_INDEX_SHIFT );intel_ring_emit (ring, seqno);intel_ring_emit (ring,MI_USER_INTERRUPT );intel_ring_advance (ring); - *result = seqno; +return seqno; +}
This still looks like it's returning an error sometimes and a seqno other times; I don't think you can mix those two.
Quoted 28 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +22
-3+static int +gen6_blt_add_request (struct intel_ring_buffer *ring, +u32 *result) +{ +struct drm_device *dev = ring->dev; +struct drm_i915_private *dev_priv = dev->dev_private; + *result =gen6_add_request (ring, +RBSYNC ,/* render->blitter sync */ +VBSYNC );/* video->blitter sync */ return 0 ; } -int -intel_ring_sync(struct intel_ring_buffer *ring, - struct intel_ring_buffer *to, +static int +gen6_bsd_add_request (struct intel_ring_buffer *ring, +u32 *result) +{ +struct drm_device *dev = ring->dev; +struct drm_i915_private *dev_priv = dev->dev_private; + *result =gen6_add_request (ring, +RVSYNC ,/* video->render sync */ +BVSYNC );/* video->blitter sync */ +return 0 ; +} + +static int
drivers/gpu/drm/i915/intel_ringbuffer.c gen6_add_request(struct intel_ring_buffer *ring, · line 399
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +10
-0+gen6_render_add_request(struct intel_ring_buffer *ring, + u32 *result) +{ + struct drm_device *dev = ring->dev; +struct drm_i915_private *dev_priv = dev->dev_private; + *result =gen6_add_request (ring, +VRSYNC ,/* render->video sync */ +BRSYNC );/* render->blitter sync */ +return 0 ; +}
These need to check the error return from gen6_add_request.
Signature · 1 line
[email protected]
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx