drm/i915: Comments for semaphore clarification

Semaphores are tied very closely to the rings in the GPU. Trivial patch
adds comments to the existing code so that when we add new rings we can
include comments there as well. It also helps distinguish the ring to
semaphore mailbox interactions by using the ringname in the semaphore
data structures.

This patch should have no functional impact.

v2: The English parts (as opposed to register names) of the comments
were reversed. (Damien)

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 9b97cf66a5ae..2d2a3622639c 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1671,9 +1671,9 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
                 ring->get_seqno = gen6_ring_get_seqno;
                 ring->set_seqno = ring_set_seqno;
                 ring->sync_to = gen6_ring_sync;
-                ring->semaphore_register[0] = MI_SEMAPHORE_SYNC_INVALID;
-                ring->semaphore_register[1] = MI_SEMAPHORE_SYNC_RV;
-                ring->semaphore_register[2] = MI_SEMAPHORE_SYNC_RB;
+                ring->semaphore_register[RCS] = MI_SEMAPHORE_SYNC_INVALID;
+                ring->semaphore_register[VCS] = MI_SEMAPHORE_SYNC_RV;
+                ring->semaphore_register[BCS] = MI_SEMAPHORE_SYNC_RB;
                 ring->signal_mbox[0] = GEN6_VRSYNC;
                 ring->signal_mbox[1] = GEN6_BRSYNC;
         } else if (IS_GEN5(dev)) {
@@ -1830,9 +1830,9 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)
                 ring->irq_put = gen6_ring_put_irq;
                 ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;
                 ring->sync_to = gen6_ring_sync;
-                ring->semaphore_register[0] = MI_SEMAPHORE_SYNC_VR;
-                ring->semaphore_register[1] = MI_SEMAPHORE_SYNC_INVALID;
-                ring->semaphore_register[2] = MI_SEMAPHORE_SYNC_VB;
+                ring->semaphore_register[RCS] = MI_SEMAPHORE_SYNC_VR;
+                ring->semaphore_register[VCS] = MI_SEMAPHORE_SYNC_INVALID;
+                ring->semaphore_register[BCS] = MI_SEMAPHORE_SYNC_VB;
                 ring->signal_mbox[0] = GEN6_RVSYNC;
                 ring->signal_mbox[1] = GEN6_BVSYNC;
         } else {
@@ -1876,9 +1876,9 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)
         ring->irq_put = gen6_ring_put_irq;
         ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;
         ring->sync_to = gen6_ring_sync;
-        ring->semaphore_register[0] = MI_SEMAPHORE_SYNC_BR;
-        ring->semaphore_register[1] = MI_SEMAPHORE_SYNC_BV;
-        ring->semaphore_register[2] = MI_SEMAPHORE_SYNC_INVALID;
+        ring->semaphore_register[RCS] = MI_SEMAPHORE_SYNC_BR;
+        ring->semaphore_register[VCS] = MI_SEMAPHORE_SYNC_BV;
+        ring->semaphore_register[BCS] = MI_SEMAPHORE_SYNC_INVALID;
         ring->signal_mbox[0] = GEN6_RBSYNC;
         ring->signal_mbox[1] = GEN6_VBSYNC;
         ring->init = init_ring_common;