Skip to contentSkip to conversation

drm/i915: Replace gen6 semaphore signal table with code

PATCH Superseded Tvrtko Ursulin 5 participants 18 messages Jul 21, 2016 – Jul 22, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Replace gen6 semaphore signal table with code

From: Tvrtko Ursulin <[email protected]>

Static table wastes space for invalid combinations and engines which are not supported by Gen6 (legacy semaphores).

Replace it with a function devised by Dave Gordon.

I have verified that it generates the same mappings between mbox selectors and signalling registers.

Cc Dave Gordon <[email protected]>
Cc Chris Wilson <[email protected]>
---
 drivers/gpu/drm/i915/i915_reg.h         |  7 ++---
 drivers/gpu/drm/i915/intel_engine_cs.c  | 48 +++++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_ringbuffer.c | 40 ++-------------------------
 drivers/gpu/drm/i915/intel_ringbuffer.h |  3 +++
 4 files changed, 57 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -3
index 8bfde75789f6..28aa876e2d87 100644
@@ -1604,9 +1604,10 @@ enum skl_disp_power_wells {
 #define RING_HEAD(base)		_MMIO((base)+0x34)
 #define RING_START(base)	_MMIO((base)+0x38)
 #define RING_CTL(base)		_MMIO((base)+0x3c)
-#define RING_SYNC_0(base)	_MMIO((base)+0x40)
-#define RING_SYNC_1(base)	_MMIO((base)+0x44)
-#define RING_SYNC_2(base)	_MMIO((base)+0x48)
+#define RING_SYNC(base, n)	_MMIO((base) + 0x40 + (n) * 4)
+#define RING_SYNC_0(base)	RING_SYNC(base, 0)
+#define RING_SYNC_1(base)	RING_SYNC(base, 1)
+#define RING_SYNC_2(base)	RING_SYNC(base, 2)
 #define GEN6_RVSYNC	(RING_SYNC_0(RENDER_RING_BASE))
 #define GEN6_RBSYNC	(RING_SYNC_1(RENDER_RING_BASE))
 #define GEN6_RVESYNC	(RING_SYNC_2(RENDER_RING_BASE))
drivers/gpu/drm/i915/intel_engine_cs.c +48 -0

51 lines not on this page · raw message

drivers/gpu/drm/i915/intel_ringbuffer.c +2 -38
index b844e6984ae7..049527d381de 100644
@@ -2731,44 +2731,8 @@ static void intel_ring_init_semaphores(struct drm_i915_private *dev_priv,
 		 * sema between VCS2 and RCS later.
 		 */
 		for (i = 0; i < I915_NUM_ENGINES; i++) {
-			static const struct {
-				u32 wait_mbox;
-				i915_reg_t mbox_reg;
-			} sem_data[I915_NUM_ENGINES][I915_NUM_ENGINES] = {
-				[RCS] = {
-					[VCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_RV,  .mbox_reg = GEN6_VRSYNC },
-					[BCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_RB,  .mbox_reg = GEN6_BRSYNC },
-					[VECS] = { .wait_mbox = MI_SEMAPHORE_SYNC_RVE, .mbox_reg = GEN6_VERSYNC },
-				},
-				[VCS] = {
-					[RCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VR,  .mbox_reg = GEN6_RVSYNC },
-					[BCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VB,  .mbox_reg = GEN6_BVSYNC },
-					[VECS] = { .wait_mbox = MI_SEMAPHORE_SYNC_VVE, .mbox_reg = GEN6_VEVSYNC },
-				},
-				[BCS] = {
-					[RCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_BR,  .mbox_reg = GEN6_RBSYNC },
-					[VCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_BV,  .mbox_reg = GEN6_VBSYNC },
-					[VECS] = { .wait_mbox = MI_SEMAPHORE_SYNC_BVE, .mbox_reg = GEN6_VEBSYNC },
-				},
-				[VECS] = {
-					[RCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VER, .mbox_reg = GEN6_RVESYNC },
-					[VCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VEV, .mbox_reg = GEN6_VVESYNC },
-					[BCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VEB, .mbox_reg = GEN6_BVESYNC },
-				},
-			};
-			u32 wait_mbox;
-			i915_reg_t mbox_reg;
-
-			if (i == engine->id || i == VCS2) {
-				wait_mbox = MI_SEMAPHORE_SYNC_INVALID;
-				mbox_reg = GEN6_NOSYNC;
-			} else {
-				wait_mbox = sem_data[engine->id][i].wait_mbox;
-				mbox_reg = sem_data[engine->id][i].mbox_reg;
-			}
-
-			engine->semaphore.mbox.wait[i] = wait_mbox;
-			engine->semaphore.mbox.signal[i] = mbox_reg;
+			engine->semaphore.mbox.wait[i] = gen6_wait_mbox(engine->id, i);
+			engine->semaphore.mbox.signal[i] = gen6_signal_reg(engine->id, i);
 		}
 	}
 }
drivers/gpu/drm/i915/intel_ringbuffer.h +3 -0
index 05bab8bda63d..802adcd51569 100644
@@ -493,6 +493,9 @@ int intel_ring_invalidate_all_caches(struct drm_i915_gem_request *req);
 int intel_init_pipe_control(struct intel_engine_cs *engine, int size);
 void intel_fini_pipe_control(struct intel_engine_cs *engine);
 
+u32 gen6_wait_mbox(enum intel_engine_id x, enum intel_engine_id y);
+i915_reg_t gen6_signal_reg(enum intel_engine_id x, enum intel_engine_id y);
+
 void intel_engine_setup_common(struct intel_engine_cs *engine);
 int intel_engine_init_common(struct intel_engine_cs *engine);
 
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✗ Ro.CI.BAT: failure for drm/i915: Replace gen6 semaphore signal table with code

== Series Details ==

== Series Details ==

Series: drm/i915: Replace gen6 semaphore signal table with code
URL : https://patchwork.freedesktop.org/series/10129/
State : failure

== Summary ==

Series 10129v1 drm/i915: Replace gen6 semaphore signal table with code
http://patchwork.freedesktop.org/api/1.0/series/10129/revisions/1/mbox

Test gem_exec_suspend:

        Subgroup basic-s3:
                incomplete -> PASS       (fi-skl-i7-6700k)
Test gem_sync:
        Subgroup basic-store-each:
                pass       -> DMESG-FAIL (ro-bdw-i7-5600u)
Test kms_cursor_legacy:
        Subgroup basic-cursor-vs-flip:
                pass       -> FAIL       (ro-ilk1-i5-650)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                skip       -> DMESG-WARN (ro-bdw-i7-5557U)
        Subgroup suspend-read-crc-pipe-c:
                dmesg-warn -> SKIP       (ro-bdw-i7-5557U)
fi-hsw-i7-4770k  total:244  pass:216  dwarn:0   dfail:0   fail:8   skip:20 
fi-kbl-qkkr      total:244  pass:179  dwarn:29  dfail:0   fail:8   skip:28 
fi-skl-i5-6260u  total:244  pass:224  dwarn:0   dfail:0   fail:8   skip:12 
fi-skl-i7-6700k  total:244  pass:210  dwarn:0   dfail:0   fail:8   skip:26 
fi-snb-i7-2600   total:244  pass:196  dwarn:0   dfail:0   fail:8   skip:40 
ro-bdw-i5-5250u  total:244  pass:219  dwarn:4   dfail:0   fail:8   skip:13 
ro-bdw-i7-5557U  total:244  pass:220  dwarn:2   dfail:0   fail:8   skip:14 
ro-bdw-i7-5600u  total:244  pass:203  dwarn:0   dfail:1   fail:8   skip:32 
ro-bsw-n3050     total:218  pass:173  dwarn:0   dfail:0   fail:2   skip:42 
ro-byt-n2820     total:244  pass:197  dwarn:0   dfail:0   fail:9   skip:38 
ro-hsw-i3-4010u  total:244  pass:212  dwarn:0   dfail:0   fail:8   skip:24 
ro-hsw-i7-4770r  total:244  pass:212  dwarn:0   dfail:0   fail:8   skip:24 
ro-ilk-i7-620lm  total:244  pass:172  dwarn:0   dfail:0   fail:9   skip:63 
ro-ilk1-i5-650   total:239  pass:171  dwarn:0   dfail:0   fail:10  skip:58 
ro-ivb-i7-3770   total:244  pass:203  dwarn:0   dfail:0   fail:8   skip:33 
ro-skl3-i5-6260u total:244  pass:224  dwarn:0   dfail:0   fail:8   skip:12 
ro-snb-i7-2620M  total:244  pass:193  dwarn:0   dfail:0   fail:9   skip:42 

Results at /archive/results/CI_IGT_test/RO_Patchwork_1559/

784a7749 drm-intel-nightly: 2016y-07m-21d-09h-00m-52s UTC integration manifest 3d1f60f drm/i915: Replace gen6 semaphore signal table with code

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
In reply to Tvrtko Ursulin
Quoted 57 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

Static table wastes space for invalid combinations and engines which are not supported by Gen6 (legacy semaphores).

Replace it with a function devised by Dave Gordon.

I have verified that it generates the same mappings between mbox selectors and signalling registers.

Cc Dave Gordon <[email protected]>
Cc Chris Wilson <[email protected]>
---
 drivers/gpu/drm/i915/i915_reg.h         |  7 ++---
 drivers/gpu/drm/i915/intel_engine_cs.c  | 48 +++++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_ringbuffer.c | 40 ++-------------------------
 drivers/gpu/drm/i915/intel_ringbuffer.h |  3 +++
 4 files changed, 57 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -3
index 8bfde75789f6..28aa876e2d87 100644
@@ -1604,9 +1604,10 @@ enum skl_disp_power_wells {
 #define RING_HEAD(base)		_MMIO((base)+0x34)
 #define RING_START(base)	_MMIO((base)+0x38)
 #define RING_CTL(base)		_MMIO((base)+0x3c)
-#define RING_SYNC_0(base)	_MMIO((base)+0x40)
-#define RING_SYNC_1(base)	_MMIO((base)+0x44)
-#define RING_SYNC_2(base)	_MMIO((base)+0x48)
+#define RING_SYNC(base, n)	_MMIO((base) + 0x40 + (n) * 4)
+#define RING_SYNC_0(base)	RING_SYNC(base, 0)
+#define RING_SYNC_1(base)	RING_SYNC(base, 1)
+#define RING_SYNC_2(base)	RING_SYNC(base, 2)
 #define GEN6_RVSYNC	(RING_SYNC_0(RENDER_RING_BASE))
 #define GEN6_RBSYNC	(RING_SYNC_1(RENDER_RING_BASE))
 #define GEN6_RVESYNC	(RING_SYNC_2(RENDER_RING_BASE))
drivers/gpu/drm/i915/intel_engine_cs.c +11 -0
index f4a35ec78481..9837fddae259 100644
@@ -209,3 +209,51 @@ int intel_engine_init_common(struct intel_engine_cs *engine)
 
 	return i915_cmd_parser_init_ring(engine);
 }
+
+#define I915_NUM_GEN6_SEMAPHORE_ENGINES (4)
+
+static int gen6_sem_f(unsigned int x, unsigned int y)
+{
+	if (x == y)
+		return -1;
+
+	x = intel_engines[x].guc_id;
+	y = intel_engines[y].guc_id;
+

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 232

Quoted 10 lines
drivers/gpu/drm/i915/intel_engine_cs.c +10 -0
+	if (x >= I915_NUM_GEN6_SEMAPHORE_ENGINES ||
+	    y >= I915_NUM_GEN6_SEMAPHORE_ENGINES)
+		return -1;
+
+	x -= x >= y;
+	if (y == 1)
+		x = 3 - x;
+	x += y & 1;
+	return x % 3;
+}

Are we trying to submit i915 into IOCCC?

Quoted 99 lines
drivers/gpu/drm/i915/intel_engine_cs.c +27 -0
+
+u32 gen6_wait_mbox(enum intel_engine_id x, enum intel_engine_id y)
+{
+	int r;
+
+	r = gen6_sem_f(x, y);
+	if (r < 0)
+		return MI_SEMAPHORE_SYNC_INVALID;
+
+	if (r == 1)
+		r = 2;
+	else if (r == 2)
+		r = 1;
+
+	return r << 16;
+}
+
+i915_reg_t gen6_signal_reg(enum intel_engine_id x, enum intel_engine_id y)
+{
+	int r;
+
+	r = gen6_sem_f(x, y);
+	if (r < 0)
+		return GEN6_NOSYNC;
+
+	return RING_SYNC(intel_engines[y].mmio_base, r);
+}
drivers/gpu/drm/i915/intel_ringbuffer.c +2 -38
index b844e6984ae7..049527d381de 100644
@@ -2731,44 +2731,8 @@ static void intel_ring_init_semaphores(struct drm_i915_private *dev_priv,
 		 * sema between VCS2 and RCS later.
 		 */
 		for (i = 0; i < I915_NUM_ENGINES; i++) {
-			static const struct {
-				u32 wait_mbox;
-				i915_reg_t mbox_reg;
-			} sem_data[I915_NUM_ENGINES][I915_NUM_ENGINES] = {
-				[RCS] = {
-					[VCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_RV,  .mbox_reg = GEN6_VRSYNC },
-					[BCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_RB,  .mbox_reg = GEN6_BRSYNC },
-					[VECS] = { .wait_mbox = MI_SEMAPHORE_SYNC_RVE, .mbox_reg = GEN6_VERSYNC },
-				},
-				[VCS] = {
-					[RCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VR,  .mbox_reg = GEN6_RVSYNC },
-					[BCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VB,  .mbox_reg = GEN6_BVSYNC },
-					[VECS] = { .wait_mbox = MI_SEMAPHORE_SYNC_VVE, .mbox_reg = GEN6_VEVSYNC },
-				},
-				[BCS] = {
-					[RCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_BR,  .mbox_reg = GEN6_RBSYNC },
-					[VCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_BV,  .mbox_reg = GEN6_VBSYNC },
-					[VECS] = { .wait_mbox = MI_SEMAPHORE_SYNC_BVE, .mbox_reg = GEN6_VEBSYNC },
-				},
-				[VECS] = {
-					[RCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VER, .mbox_reg = GEN6_RVESYNC },
-					[VCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VEV, .mbox_reg = GEN6_VVESYNC },
-					[BCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VEB, .mbox_reg = GEN6_BVESYNC },
-				},
-			};
-			u32 wait_mbox;
-			i915_reg_t mbox_reg;
-
-			if (i == engine->id || i == VCS2) {
-				wait_mbox = MI_SEMAPHORE_SYNC_INVALID;
-				mbox_reg = GEN6_NOSYNC;
-			} else {
-				wait_mbox = sem_data[engine->id][i].wait_mbox;
-				mbox_reg = sem_data[engine->id][i].mbox_reg;
-			}
-
-			engine->semaphore.mbox.wait[i] = wait_mbox;
-			engine->semaphore.mbox.signal[i] = mbox_reg;
+			engine->semaphore.mbox.wait[i] = gen6_wait_mbox(engine->id, i);
+			engine->semaphore.mbox.signal[i] = gen6_signal_reg(engine->id, i);
 		}
 	}
 }
drivers/gpu/drm/i915/intel_ringbuffer.h +3 -0
index 05bab8bda63d..802adcd51569 100644
@@ -493,6 +493,9 @@ int intel_ring_invalidate_all_caches(struct drm_i915_gem_request *req);
 int intel_init_pipe_control(struct intel_engine_cs *engine, int size);
 void intel_fini_pipe_control(struct intel_engine_cs *engine);
 
+u32 gen6_wait_mbox(enum intel_engine_id x, enum intel_engine_id y);
+i915_reg_t gen6_signal_reg(enum intel_engine_id x, enum intel_engine_id y);
+
 void intel_engine_setup_common(struct intel_engine_cs *engine);
 int intel_engine_init_common(struct intel_engine_cs *engine);
 
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw
In reply to Tvrtko Ursulin
Quoted 46 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

Static table wastes space for invalid combinations and engines which are not supported by Gen6 (legacy semaphores).

Replace it with a function devised by Dave Gordon.

I have verified that it generates the same mappings between mbox selectors and signalling registers.

Cc Dave Gordon <[email protected]>
Cc Chris Wilson <[email protected]>
---
  drivers/gpu/drm/i915/i915_reg.h         |  7 ++---
  drivers/gpu/drm/i915/intel_engine_cs.c  | 48 +++++++++++++++++++++++++++++++++
  drivers/gpu/drm/i915/intel_ringbuffer.c | 40 ++-------------------------
  drivers/gpu/drm/i915/intel_ringbuffer.h |  3 +++
  4 files changed, 57 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -3
index 8bfde75789f6..28aa876e2d87 100644
@@ -1604,9 +1604,10 @@ enum skl_disp_power_wells {
  #define RING_HEAD(base)		_MMIO((base)+0x34)
  #define RING_START(base)	_MMIO((base)+0x38)
  #define RING_CTL(base)		_MMIO((base)+0x3c)
-#define RING_SYNC_0(base)	_MMIO((base)+0x40)
-#define RING_SYNC_1(base)	_MMIO((base)+0x44)
-#define RING_SYNC_2(base)	_MMIO((base)+0x48)
+#define RING_SYNC(base, n)	_MMIO((base) + 0x40 + (n) * 4)
+#define RING_SYNC_0(base)	RING_SYNC(base, 0)
+#define RING_SYNC_1(base)	RING_SYNC(base, 1)
+#define RING_SYNC_2(base)	RING_SYNC(base, 2)
  #define GEN6_RVSYNC	(RING_SYNC_0(RENDER_RING_BASE))
  #define GEN6_RBSYNC	(RING_SYNC_1(RENDER_RING_BASE))
  #define GEN6_RVESYNC	(RING_SYNC_2(RENDER_RING_BASE))
drivers/gpu/drm/i915/intel_engine_cs.c +0 -0
index f4a35ec78481..9837fddae259 100644
@@ -209,3 +209,51 @@ int intel_engine_init_common(struct intel_engine_cs *engine)
 
  	return i915_cmd_parser_init_ring(engine);
  }

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 221

Quoted 10 lines
drivers/gpu/drm/i915/intel_engine_cs.c +10 -0
+
+#define I915_NUM_GEN6_SEMAPHORE_ENGINES (4)
+
+static int gen6_sem_f(unsigned int x, unsigned int y)
+{
+	if (x == y)
+		return -1;
+
+	x = intel_engines[x].guc_id;
+	y = intel_engines[y].guc_id;

You could have the caller pass two engine pointers rather than converting passing indexes that aren't actually the values needed.

Or you could have the caller pass the 'hw_id' (probably better than 'guc_id') directly.

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 225

Quoted 4 lines
drivers/gpu/drm/i915/intel_engine_cs.c +4 -0
+
+	if (x >= I915_NUM_GEN6_SEMAPHORE_ENGINES ||
+	    y >= I915_NUM_GEN6_SEMAPHORE_ENGINES)
+		return -1;

And maybe move all the error checking out, so this function *just* contains the tricksy calculation below?

Quoted 10 lines
drivers/gpu/drm/i915/intel_engine_cs.c +10 -0
+
+	x -= x >= y;
+	if (y == 1)
+		x = 3 - x;
+	x += y & 1;
+	return x % 3;
+}
+
+u32 gen6_wait_mbox(enum intel_engine_id x, enum intel_engine_id y)
+{

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 245

Quoted 10 lines
drivers/gpu/drm/i915/intel_engine_cs.c +10 -0
+	int r;
+
+	r = gen6_sem_f(x, y);
+	if (r < 0)
+		return MI_SEMAPHORE_SYNC_INVALID;
+
+	if (r == 1)
+		r = 2;
+	else if (r == 2)
+		r = 1;

BTW this is ((-r) % 3). Since gen6_sem_f() already does a "% 3" at the end you might want to pass it a flag and let it do the negation when required.

int gen6_sem_f2(unsigned int hw_x, unsigned int hw_y, bool wait)

{
    hw_x -= hw_x >= hw_y;
    hw_x += hw_y & 1;
    hw_x ^= hw_y & hw_x >> hw_y; /* WTF? */
    return (wait ? -hw_x : hw_x) % 3;
}

.Dave.

Quoted 71 lines
drivers/gpu/drm/i915/intel_engine_cs.c +14 -0
+
+	return r << 16;
+}
+
+i915_reg_t gen6_signal_reg(enum intel_engine_id x, enum intel_engine_id y)
+{
+	int r;
+
+	r = gen6_sem_f(x, y);
+	if (r < 0)
+		return GEN6_NOSYNC;
+
+	return RING_SYNC(intel_engines[y].mmio_base, r);
+}
drivers/gpu/drm/i915/intel_ringbuffer.c +2 -38
index b844e6984ae7..049527d381de 100644
@@ -2731,44 +2731,8 @@ static void intel_ring_init_semaphores(struct drm_i915_private *dev_priv,
  		 * sema between VCS2 and RCS later.
  		 */
  		for (i = 0; i < I915_NUM_ENGINES; i++) {
-			static const struct {
-				u32 wait_mbox;
-				i915_reg_t mbox_reg;
-			} sem_data[I915_NUM_ENGINES][I915_NUM_ENGINES] = {
-				[RCS] = {
-					[VCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_RV,  .mbox_reg = GEN6_VRSYNC },
-					[BCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_RB,  .mbox_reg = GEN6_BRSYNC },
-					[VECS] = { .wait_mbox = MI_SEMAPHORE_SYNC_RVE, .mbox_reg = GEN6_VERSYNC },
-				},
-				[VCS] = {
-					[RCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VR,  .mbox_reg = GEN6_RVSYNC },
-					[BCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VB,  .mbox_reg = GEN6_BVSYNC },
-					[VECS] = { .wait_mbox = MI_SEMAPHORE_SYNC_VVE, .mbox_reg = GEN6_VEVSYNC },
-				},
-				[BCS] = {
-					[RCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_BR,  .mbox_reg = GEN6_RBSYNC },
-					[VCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_BV,  .mbox_reg = GEN6_VBSYNC },
-					[VECS] = { .wait_mbox = MI_SEMAPHORE_SYNC_BVE, .mbox_reg = GEN6_VEBSYNC },
-				},
-				[VECS] = {
-					[RCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VER, .mbox_reg = GEN6_RVESYNC },
-					[VCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VEV, .mbox_reg = GEN6_VVESYNC },
-					[BCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VEB, .mbox_reg = GEN6_BVESYNC },
-				},
-			};
-			u32 wait_mbox;
-			i915_reg_t mbox_reg;
-
-			if (i == engine->id || i == VCS2) {
-				wait_mbox = MI_SEMAPHORE_SYNC_INVALID;
-				mbox_reg = GEN6_NOSYNC;
-			} else {
-				wait_mbox = sem_data[engine->id][i].wait_mbox;
-				mbox_reg = sem_data[engine->id][i].mbox_reg;
-			}
-
-			engine->semaphore.mbox.wait[i] = wait_mbox;
-			engine->semaphore.mbox.signal[i] = mbox_reg;
+			engine->semaphore.mbox.wait[i] = gen6_wait_mbox(engine->id, i);
+			engine->semaphore.mbox.signal[i] = gen6_signal_reg(engine->id, i);
  		}
  	}
  }
drivers/gpu/drm/i915/intel_ringbuffer.h +0 -0
index 05bab8bda63d..802adcd51569 100644

drivers/gpu/drm/i915/intel_ringbuffer.h int intel_ring_invalidate_all_caches(struct drm_i915_gem_request *req); · line 501

Quoted 9 lines
drivers/gpu/drm/i915/intel_ringbuffer.h +3 -0
@@ -493,6 +493,9 @@ int intel_ring_invalidate_all_caches(struct drm_i915_gem_request *req);
  int intel_init_pipe_control(struct intel_engine_cs *engine, int size);
  void intel_fini_pipe_control(struct intel_engine_cs *engine);
 
+u32 gen6_wait_mbox(enum intel_engine_id x, enum intel_engine_id y);
+i915_reg_t gen6_signal_reg(enum intel_engine_id x, enum intel_engine_id y);
+
  void intel_engine_setup_common(struct intel_engine_cs *engine);
  int intel_engine_init_common(struct intel_engine_cs *engine);
 

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw
Quoted 50 lines · Dave Gordon
Quoted 49 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

Static table wastes space for invalid combinations and engines which are not supported by Gen6 (legacy semaphores).

Replace it with a function devised by Dave Gordon.

I have verified that it generates the same mappings between mbox selectors and signalling registers.

Cc Dave Gordon <[email protected]>
Cc Chris Wilson <[email protected]>
---
  drivers/gpu/drm/i915/i915_reg.h         |  7 ++---
  drivers/gpu/drm/i915/intel_engine_cs.c  | 48
+++++++++++++++++++++++++++++++++
  drivers/gpu/drm/i915/intel_ringbuffer.c | 40
++-------------------------
  drivers/gpu/drm/i915/intel_ringbuffer.h |  3 +++
  4 files changed, 57 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -3
index 8bfde75789f6..28aa876e2d87 100644
@@ -1604,9 +1604,10 @@ enum skl_disp_power_wells {
  #define RING_HEAD(base)        _MMIO((base)+0x34)
  #define RING_START(base)    _MMIO((base)+0x38)
  #define RING_CTL(base)        _MMIO((base)+0x3c)
-#define RING_SYNC_0(base)    _MMIO((base)+0x40)
-#define RING_SYNC_1(base)    _MMIO((base)+0x44)
-#define RING_SYNC_2(base)    _MMIO((base)+0x48)
+#define RING_SYNC(base, n)    _MMIO((base) + 0x40 + (n) * 4)
+#define RING_SYNC_0(base)    RING_SYNC(base, 0)
+#define RING_SYNC_1(base)    RING_SYNC(base, 1)
+#define RING_SYNC_2(base)    RING_SYNC(base, 2)
  #define GEN6_RVSYNC    (RING_SYNC_0(RENDER_RING_BASE))
  #define GEN6_RBSYNC    (RING_SYNC_1(RENDER_RING_BASE))
  #define GEN6_RVESYNC    (RING_SYNC_2(RENDER_RING_BASE))
drivers/gpu/drm/i915/intel_engine_cs.c +0 -0
index f4a35ec78481..9837fddae259 100644
@@ -209,3 +209,51 @@ int intel_engine_init_common(struct
 intel_engine_cs *engine)
 
Quoted 15 lines

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 221

Quoted 12 lines
drivers/gpu/drm/i915/intel_engine_cs.c +10 -0
      return i915_cmd_parser_init_ring(engine);
  }
+
+#define I915_NUM_GEN6_SEMAPHORE_ENGINES (4)
+
+static int gen6_sem_f(unsigned int x, unsigned int y)
+{
+    if (x == y)
+        return -1;
+
+    x = intel_engines[x].guc_id;
+    y = intel_engines[y].guc_id;

You could have the caller pass two engine pointers rather than converting passing indexes that aren't actually the values needed.

Can't do that, need to use the intel_engines static tables since dev_priv->engine arrray is not yet fully initialized at this point.

Quoted 2 lines

Or you could have the caller pass the 'hw_id' (probably better than 'guc_id') directly.

It is called guc_id in this table and it is the only one.

Quoted 8 lines

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 225

Quoted 5 lines
drivers/gpu/drm/i915/intel_engine_cs.c +4 -0
+
+    if (x >= I915_NUM_GEN6_SEMAPHORE_ENGINES ||
+        y >= I915_NUM_GEN6_SEMAPHORE_ENGINES)
+        return -1;

And maybe move all the error checking out, so this function *just* contains the tricksy calculation below?

Oh I don't know, it is at a single place like this. But I do agree it is making the function impure. I did think about it but concluded it does not matter hugely since it is all very little code.

Quoted 25 lines
Quoted 10 lines
drivers/gpu/drm/i915/intel_engine_cs.c +10 -0
+
+    x -= x >= y;
+    if (y == 1)
+        x = 3 - x;
+    x += y & 1;
+    return x % 3;
+}
+
+u32 gen6_wait_mbox(enum intel_engine_id x, enum intel_engine_id y)
+{

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 245

Quoted 10 lines
drivers/gpu/drm/i915/intel_engine_cs.c +10 -0
+    int r;
+
+    r = gen6_sem_f(x, y);
+    if (r < 0)
+        return MI_SEMAPHORE_SYNC_INVALID;
+
+    if (r == 1)
+        r = 2;
+    else if (r == 2)
+        r = 1;

BTW this is ((-r) % 3). Since gen6_sem_f() already does a "% 3" at the end you might want to pass it a flag and let it do the negation when required.

Quoted 7 lines

int gen6_sem_f2(unsigned int hw_x, unsigned int hw_y, bool wait)

{
     hw_x -= hw_x >= hw_y;
     hw_x += hw_y & 1;
     hw_x ^= hw_y & hw_x >> hw_y; /* WTF? */
     return (wait ? -hw_x : hw_x) % 3;
}

Now I got three flavours to pick from! :)

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

PATCH v2 1/1 drm/i915: Replace gen6 semaphore signal table with code

In reply to Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

Static table wastes space for invalid combinations and engines which are not supported by Gen6 (legacy semaphores).

Replace it with a function devised by Dave Gordon.

I have verified that it generates the same mappings between mbox selectors and signalling registers.

v2: Add a comment describing what gen6_sem_f does.

Cc Dave Gordon <[email protected]>
Cc Chris Wilson <[email protected]>
---
 drivers/gpu/drm/i915/i915_reg.h         |  7 ++---
 drivers/gpu/drm/i915/intel_engine_cs.c  | 48 +++++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_ringbuffer.c | 40 ++-------------------------
 drivers/gpu/drm/i915/intel_ringbuffer.h |  3 +++
 4 files changed, 57 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -3
index 9397ddec26b9..c2fe718582c8 100644
@@ -1604,9 +1604,10 @@ enum skl_disp_power_wells {
 #define RING_HEAD(base)		_MMIO((base)+0x34)
 #define RING_START(base)	_MMIO((base)+0x38)
 #define RING_CTL(base)		_MMIO((base)+0x3c)
-#define RING_SYNC_0(base)	_MMIO((base)+0x40)
-#define RING_SYNC_1(base)	_MMIO((base)+0x44)
-#define RING_SYNC_2(base)	_MMIO((base)+0x48)
+#define RING_SYNC(base, n)	_MMIO((base) + 0x40 + (n) * 4)
+#define RING_SYNC_0(base)	RING_SYNC(base, 0)
+#define RING_SYNC_1(base)	RING_SYNC(base, 1)
+#define RING_SYNC_2(base)	RING_SYNC(base, 2)
 #define GEN6_RVSYNC	(RING_SYNC_0(RENDER_RING_BASE))
 #define GEN6_RBSYNC	(RING_SYNC_1(RENDER_RING_BASE))
 #define GEN6_RVESYNC	(RING_SYNC_2(RENDER_RING_BASE))
drivers/gpu/drm/i915/intel_engine_cs.c +48 -0

51 lines not on this page · raw message

drivers/gpu/drm/i915/intel_ringbuffer.c +2 -38
index 0b5d1de8a7fb..fabf8b6bcae6 100644
@@ -2745,44 +2745,8 @@ static void intel_ring_init_semaphores(struct drm_i915_private *dev_priv,
 		 * sema between VCS2 and RCS later.
 		 */
 		for (i = 0; i < I915_NUM_ENGINES; i++) {
-			static const struct {
-				u32 wait_mbox;
-				i915_reg_t mbox_reg;
-			} sem_data[I915_NUM_ENGINES][I915_NUM_ENGINES] = {
-				[RCS] = {
-					[VCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_RV,  .mbox_reg = GEN6_VRSYNC },
-					[BCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_RB,  .mbox_reg = GEN6_BRSYNC },
-					[VECS] = { .wait_mbox = MI_SEMAPHORE_SYNC_RVE, .mbox_reg = GEN6_VERSYNC },
-				},
-				[VCS] = {
-					[RCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VR,  .mbox_reg = GEN6_RVSYNC },
-					[BCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VB,  .mbox_reg = GEN6_BVSYNC },
-					[VECS] = { .wait_mbox = MI_SEMAPHORE_SYNC_VVE, .mbox_reg = GEN6_VEVSYNC },
-				},
-				[BCS] = {
-					[RCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_BR,  .mbox_reg = GEN6_RBSYNC },
-					[VCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_BV,  .mbox_reg = GEN6_VBSYNC },
-					[VECS] = { .wait_mbox = MI_SEMAPHORE_SYNC_BVE, .mbox_reg = GEN6_VEBSYNC },
-				},
-				[VECS] = {
-					[RCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VER, .mbox_reg = GEN6_RVESYNC },
-					[VCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VEV, .mbox_reg = GEN6_VVESYNC },
-					[BCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VEB, .mbox_reg = GEN6_BVESYNC },
-				},
-			};
-			u32 wait_mbox;
-			i915_reg_t mbox_reg;
-
-			if (i == engine->id || i == VCS2) {
-				wait_mbox = MI_SEMAPHORE_SYNC_INVALID;
-				mbox_reg = GEN6_NOSYNC;
-			} else {
-				wait_mbox = sem_data[engine->id][i].wait_mbox;
-				mbox_reg = sem_data[engine->id][i].mbox_reg;
-			}
-
-			engine->semaphore.mbox.wait[i] = wait_mbox;
-			engine->semaphore.mbox.signal[i] = mbox_reg;
+			engine->semaphore.mbox.wait[i] = gen6_wait_mbox(engine->id, i);
+			engine->semaphore.mbox.signal[i] = gen6_signal_reg(engine->id, i);
 		}
 	}
 }
drivers/gpu/drm/i915/intel_ringbuffer.h +3 -0
index 0f8019488d33..cb3d22752b07 100644
@@ -493,6 +493,9 @@ int intel_ring_invalidate_all_caches(struct drm_i915_gem_request *req);
 int intel_init_pipe_control(struct intel_engine_cs *engine, int size);
 void intel_fini_pipe_control(struct intel_engine_cs *engine);
 
+u32 gen6_wait_mbox(enum intel_engine_id x, enum intel_engine_id y);
+i915_reg_t gen6_signal_reg(enum intel_engine_id x, enum intel_engine_id y);
+
 void intel_engine_setup_common(struct intel_engine_cs *engine);
 int intel_engine_init_common(struct intel_engine_cs *engine);
 
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw

PATCH v3 1/1 drm/i915: Replace gen6 semaphore signal table with code

In reply to Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

Static table wastes space for invalid combinations and engines which are not supported by Gen6 (legacy semaphores).

Replace it with a function devised by Dave Gordon.

I have verified that it generates the same mappings between mbox selectors and signalling registers.

v2: Add a comment describing what gen6_sem_f does.
v3: This time with git add.

Cc Dave Gordon <[email protected]>
Cc Chris Wilson <[email protected]>
---
 drivers/gpu/drm/i915/i915_reg.h         |  7 +--
 drivers/gpu/drm/i915/intel_engine_cs.c  | 93 +++++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_ringbuffer.c | 40 +-------------
 drivers/gpu/drm/i915/intel_ringbuffer.h |  3 ++
 4 files changed, 102 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -3
index 9397ddec26b9..c2fe718582c8 100644
@@ -1604,9 +1604,10 @@ enum skl_disp_power_wells {
 #define RING_HEAD(base)		_MMIO((base)+0x34)
 #define RING_START(base)	_MMIO((base)+0x38)
 #define RING_CTL(base)		_MMIO((base)+0x3c)
-#define RING_SYNC_0(base)	_MMIO((base)+0x40)
-#define RING_SYNC_1(base)	_MMIO((base)+0x44)
-#define RING_SYNC_2(base)	_MMIO((base)+0x48)
+#define RING_SYNC(base, n)	_MMIO((base) + 0x40 + (n) * 4)
+#define RING_SYNC_0(base)	RING_SYNC(base, 0)
+#define RING_SYNC_1(base)	RING_SYNC(base, 1)
+#define RING_SYNC_2(base)	RING_SYNC(base, 2)
 #define GEN6_RVSYNC	(RING_SYNC_0(RENDER_RING_BASE))
 #define GEN6_RBSYNC	(RING_SYNC_1(RENDER_RING_BASE))
 #define GEN6_RVESYNC	(RING_SYNC_2(RENDER_RING_BASE))
drivers/gpu/drm/i915/intel_engine_cs.c +93 -0

96 lines not on this page · raw message

drivers/gpu/drm/i915/intel_ringbuffer.c +2 -38
index 0b5d1de8a7fb..fabf8b6bcae6 100644
@@ -2745,44 +2745,8 @@ static void intel_ring_init_semaphores(struct drm_i915_private *dev_priv,
 		 * sema between VCS2 and RCS later.
 		 */
 		for (i = 0; i < I915_NUM_ENGINES; i++) {
-			static const struct {
-				u32 wait_mbox;
-				i915_reg_t mbox_reg;
-			} sem_data[I915_NUM_ENGINES][I915_NUM_ENGINES] = {
-				[RCS] = {
-					[VCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_RV,  .mbox_reg = GEN6_VRSYNC },
-					[BCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_RB,  .mbox_reg = GEN6_BRSYNC },
-					[VECS] = { .wait_mbox = MI_SEMAPHORE_SYNC_RVE, .mbox_reg = GEN6_VERSYNC },
-				},
-				[VCS] = {
-					[RCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VR,  .mbox_reg = GEN6_RVSYNC },
-					[BCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VB,  .mbox_reg = GEN6_BVSYNC },
-					[VECS] = { .wait_mbox = MI_SEMAPHORE_SYNC_VVE, .mbox_reg = GEN6_VEVSYNC },
-				},
-				[BCS] = {
-					[RCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_BR,  .mbox_reg = GEN6_RBSYNC },
-					[VCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_BV,  .mbox_reg = GEN6_VBSYNC },
-					[VECS] = { .wait_mbox = MI_SEMAPHORE_SYNC_BVE, .mbox_reg = GEN6_VEBSYNC },
-				},
-				[VECS] = {
-					[RCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VER, .mbox_reg = GEN6_RVESYNC },
-					[VCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VEV, .mbox_reg = GEN6_VVESYNC },
-					[BCS] =  { .wait_mbox = MI_SEMAPHORE_SYNC_VEB, .mbox_reg = GEN6_BVESYNC },
-				},
-			};
-			u32 wait_mbox;
-			i915_reg_t mbox_reg;
-
-			if (i == engine->id || i == VCS2) {
-				wait_mbox = MI_SEMAPHORE_SYNC_INVALID;
-				mbox_reg = GEN6_NOSYNC;
-			} else {
-				wait_mbox = sem_data[engine->id][i].wait_mbox;
-				mbox_reg = sem_data[engine->id][i].mbox_reg;
-			}
-
-			engine->semaphore.mbox.wait[i] = wait_mbox;
-			engine->semaphore.mbox.signal[i] = mbox_reg;
+			engine->semaphore.mbox.wait[i] = gen6_wait_mbox(engine->id, i);
+			engine->semaphore.mbox.signal[i] = gen6_signal_reg(engine->id, i);
 		}
 	}
 }
drivers/gpu/drm/i915/intel_ringbuffer.h +3 -0
index 0f8019488d33..cb3d22752b07 100644
@@ -493,6 +493,9 @@ int intel_ring_invalidate_all_caches(struct drm_i915_gem_request *req);
 int intel_init_pipe_control(struct intel_engine_cs *engine, int size);
 void intel_fini_pipe_control(struct intel_engine_cs *engine);
 
+u32 gen6_wait_mbox(enum intel_engine_id x, enum intel_engine_id y);
+i915_reg_t gen6_signal_reg(enum intel_engine_id x, enum intel_engine_id y);
+
 void intel_engine_setup_common(struct intel_engine_cs *engine);
 int intel_engine_init_common(struct intel_engine_cs *engine);
 
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw
Quoted 9 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

Static table wastes space for invalid combinations and engines which are not supported by Gen6 (legacy semaphores).

Replace it with a function devised by Dave Gordon.

I have verified that it generates the same mappings between mbox selectors and signalling registers.

So just how big was that table? How big are the functions replacing it?

Quoted 2 lines

v2: Add a comment describing what gen6_sem_f does.
v3: This time with git add.

I like having the table a lot... Even if we don't find the function convincing we should add that comment.

Quoted 75 lines
Cc Dave Gordon <[email protected]>
Cc Chris Wilson <[email protected]>
---
 drivers/gpu/drm/i915/i915_reg.h         |  7 +--
 drivers/gpu/drm/i915/intel_engine_cs.c  | 93 +++++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_ringbuffer.c | 40 +-------------
 drivers/gpu/drm/i915/intel_ringbuffer.h |  3 ++
 4 files changed, 102 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -3
index 9397ddec26b9..c2fe718582c8 100644
@@ -1604,9 +1604,10 @@ enum skl_disp_power_wells {
 #define RING_HEAD(base)		_MMIO((base)+0x34)
 #define RING_START(base)	_MMIO((base)+0x38)
 #define RING_CTL(base)		_MMIO((base)+0x3c)
-#define RING_SYNC_0(base)	_MMIO((base)+0x40)
-#define RING_SYNC_1(base)	_MMIO((base)+0x44)
-#define RING_SYNC_2(base)	_MMIO((base)+0x48)
+#define RING_SYNC(base, n)	_MMIO((base) + 0x40 + (n) * 4)
+#define RING_SYNC_0(base)	RING_SYNC(base, 0)
+#define RING_SYNC_1(base)	RING_SYNC(base, 1)
+#define RING_SYNC_2(base)	RING_SYNC(base, 2)
 #define GEN6_RVSYNC	(RING_SYNC_0(RENDER_RING_BASE))
 #define GEN6_RBSYNC	(RING_SYNC_1(RENDER_RING_BASE))
 #define GEN6_RVESYNC	(RING_SYNC_2(RENDER_RING_BASE))
drivers/gpu/drm/i915/intel_engine_cs.c +39 -0
index f4a35ec78481..19455b20b322 100644
@@ -209,3 +209,96 @@ int intel_engine_init_common(struct intel_engine_cs *engine)
 
 	return i915_cmd_parser_init_ring(engine);
 }
+
+#define I915_NUM_GEN6_SEMAPHORE_ENGINES (4)
+
+/*
+ * For Gen6 semaphores where the driver issues MI_SEMAPHORE_MBOX commands
+ * with register selects so that a specific engine can wake up another engine
+ * waiting on a matching register, the matrix of required register selects
+ * looks like this:
+ *
+ *      |            RCS            |           VCS             |           BCS             |         VECS
+ * -----+---------------------------+---------------------------+---------------------------+---------------------------
+ *  RCS | MI_SEMAPHORE_SYNC_INVALID |    MI_SEMAPHORE_SYNC_VR   |    MI_SEMAPHORE_SYNC_BR   |    MI_SEMAPHORE_SYNC_VER
+ *  VCS |    MI_SEMAPHORE_SYNC_RV   | MI_SEMAPHORE_SYNC_INVALID |    MI_SEMAPHORE_SYNC_BV   |    MI_SEMAPHORE_SYNC_VEV
+ *  BCS |    MI_SEMAPHORE_SYNC_RB   |    MI_SEMAPHORE_SYNC_VB   | MI_SEMAPHORE_SYNC_INVALID |    MI_SEMAPHORE_SYNC_VEB
+ * VECS |    MI_SEMAPHORE_SYNC_RVE  |    MI_SEMAPHORE_SYNC_VVE  |    MI_SEMAPHORE_SYNC_BVE  | MI_SEMAPHORE_SYNC_INVALID
+ *
+ * This distilled to integers looks like this:
+ *
+ *   |  0  |  1  |  2  |  3
+ * --+-----+-----+-----+-----
+ * 0 | -1  |  0  |  2  |  1
+ * 1 |  2  | -1  |  0  |  1
+ * 2 |  0  |  2  | -1  |  1
+ * 3 |  2  |  1  |  0  | -1
+ *
+ * In the opposite direction, the same table showing register addresses is:
+ *
+ *      |     RCS      |     VCS      |     BCS      |    VECS
+ * -----+--------------+--------------+--------------+--------------
+ *  RCS | GEN6_NOSYNC  | GEN6_RVSYNC  | GEN6_RBSYNC  | GEN6_RVESYNC
+ *  VCS | GEN6_VRSYNC  | GEN6_NOSYNC  | GEN6_VBSYNC  | GEN6_VVESYNC
+ *  BCS | GEN6_VRSYNC  | GEN6_BVSYNC  | GEN6_NOSYNC  | GEN6_BVESYNC
+ * VECS | GEN6_VERSYNC | GEN6_VEVSYNC | GEN6_VEBSYNC | GEN6_NOSYNC
+ *
+ * Again this distilled to integers looks like this:
+ *
+ *   |  0  |  1  |  2  |  3
+ * --+-----+-----+-----+-----
+ * 0 | -1  |  0  |  1  |  2

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 260

Quoted 10 lines
drivers/gpu/drm/i915/intel_engine_cs.c +10 -0
+ * 1 |  1  | -1  |  0  |  2
+ * 2 |  0  |  1  | -1  |  2
+ * 3 |  1  |  2  |  0  | -1
+ *
+ * The function gen6_sem_f expresses the above table. We also notice that the
+ * difference between the first and second tabe is only a transpose of ones to
+ * twos and twos to ones.
+ */
+
+static int gen6_sem_f(unsigned int x, unsigned int y)

gen6_sema_select
gen6_semaphore_flag

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 266

Quoted 6 lines
drivers/gpu/drm/i915/intel_engine_cs.c +6 -0
+{
+	if (x == y)
+		return -1;
+
+	x = intel_engines[x].guc_id;
+	y = intel_engines[y].guc_id;

hw_id.

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 271

Quoted 5 lines
drivers/gpu/drm/i915/intel_engine_cs.c +5 -0
+
+	if (x >= I915_NUM_GEN6_SEMAPHORE_ENGINES ||
+	    y >= I915_NUM_GEN6_SEMAPHORE_ENGINES)
+		return -1;
+

/*
* X

 *      |  0  |  1  |  2  |  3
 *    --+-----+-----+-----+-----
 *    0 |     |  0  |  1  |  2
 * Y  1 |  1  |     |  0  |  2
 *    2 |  0  |  1  |     |  2
 *    3 |  1  |  2  |  0  |   

*/

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 279

Quoted 8 lines
drivers/gpu/drm/i915/intel_engine_cs.c +8 -0
+	x -= x >= y;
+	if (y == 1)
+		x = 3 - x;
+	x += y & 1;
+	return x % 3;
+}
+
+u32 gen6_wait_mbox(enum intel_engine_id x, enum intel_engine_id y)

static...

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 292

Quoted 13 lines
drivers/gpu/drm/i915/intel_engine_cs.c +13 -0
+{
+	int r;
+
+	r = gen6_sem_f(x, y);
+	if (r < 0)
+		return MI_SEMAPHORE_SYNC_INVALID;
+
+	if (r == 1)
+		r = 2;
+	else if (r == 2)
+		r = 1;
+
+	return r << 16;

/* Convert semaphore sync field to its wait flag */ switch (gen6_sem_f(x, y)) {
case 0: return 0;
case 1: return 2 << 16;
case 2: return 1 << 16;
default: eturn MI_SEMAPHORE_SYNC_INVALID;

}

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 295

Quoted 3 lines
drivers/gpu/drm/i915/intel_engine_cs.c +3 -0
+}
+
+i915_reg_t gen6_signal_reg(enum intel_engine_id x, enum intel_engine_id y)

static...

Quoted 9 lines
drivers/gpu/drm/i915/intel_engine_cs.c +9 -0
+{
+	int r;
+
+	r = gen6_sem_f(x, y);
+	if (r < 0)
+		return GEN6_NOSYNC;
+
+	return RING_SYNC(intel_engines[y].mmio_base, r);
+}
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#8 lore raw
Quoted 6 lines · Chris Wilson
Quoted 5 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

Static table wastes space for invalid combinations and engines which are not supported by Gen6 (legacy semaphores).

Quoted 6 lines
Quoted 4 lines

Replace it with a function devised by Dave Gordon.

I have verified that it generates the same mappings between mbox selectors and signalling registers.

So just how big was that table? How big are the functions replacing it?

With I915_NUM_ENGINES of 5 table is 5 * 5 * (2 * 4) = 200 bytes.

With the patch .text grows by 144 bytes here and .rodata shrinks by 256. So a net gain of 112 bytes with my config. Conclusion is that as long as we got five engines it is not that interesting to get rid of the table.

Quoted 86 lines
Quoted 2 lines

v2: Add a comment describing what gen6_sem_f does.
v3: This time with git add.

I like having the table a lot... Even if we don't find the function convincing we should add that comment.

Quoted 80 lines
Cc Dave Gordon <[email protected]>
Cc Chris Wilson <[email protected]>
---
  drivers/gpu/drm/i915/i915_reg.h         |  7 +--
  drivers/gpu/drm/i915/intel_engine_cs.c  | 93 +++++++++++++++++++++++++++++++++
  drivers/gpu/drm/i915/intel_ringbuffer.c | 40 +-------------
  drivers/gpu/drm/i915/intel_ringbuffer.h |  3 ++
  4 files changed, 102 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -3
index 9397ddec26b9..c2fe718582c8 100644
@@ -1604,9 +1604,10 @@ enum skl_disp_power_wells {
  #define RING_HEAD(base)		_MMIO((base)+0x34)
  #define RING_START(base)	_MMIO((base)+0x38)
  #define RING_CTL(base)		_MMIO((base)+0x3c)
-#define RING_SYNC_0(base)	_MMIO((base)+0x40)
-#define RING_SYNC_1(base)	_MMIO((base)+0x44)
-#define RING_SYNC_2(base)	_MMIO((base)+0x48)
+#define RING_SYNC(base, n)	_MMIO((base) + 0x40 + (n) * 4)
+#define RING_SYNC_0(base)	RING_SYNC(base, 0)
+#define RING_SYNC_1(base)	RING_SYNC(base, 1)
+#define RING_SYNC_2(base)	RING_SYNC(base, 2)
  #define GEN6_RVSYNC	(RING_SYNC_0(RENDER_RING_BASE))
  #define GEN6_RBSYNC	(RING_SYNC_1(RENDER_RING_BASE))
  #define GEN6_RVESYNC	(RING_SYNC_2(RENDER_RING_BASE))
drivers/gpu/drm/i915/intel_engine_cs.c +44 -0
index f4a35ec78481..19455b20b322 100644
@@ -209,3 +209,96 @@ int intel_engine_init_common(struct intel_engine_cs *engine)
 
  	return i915_cmd_parser_init_ring(engine);
  }
+
+#define I915_NUM_GEN6_SEMAPHORE_ENGINES (4)
+
+/*
+ * For Gen6 semaphores where the driver issues MI_SEMAPHORE_MBOX commands
+ * with register selects so that a specific engine can wake up another engine
+ * waiting on a matching register, the matrix of required register selects
+ * looks like this:
+ *
+ *      |            RCS            |           VCS             |           BCS             |         VECS
+ * -----+---------------------------+---------------------------+---------------------------+---------------------------
+ *  RCS | MI_SEMAPHORE_SYNC_INVALID |    MI_SEMAPHORE_SYNC_VR   |    MI_SEMAPHORE_SYNC_BR   |    MI_SEMAPHORE_SYNC_VER
+ *  VCS |    MI_SEMAPHORE_SYNC_RV   | MI_SEMAPHORE_SYNC_INVALID |    MI_SEMAPHORE_SYNC_BV   |    MI_SEMAPHORE_SYNC_VEV
+ *  BCS |    MI_SEMAPHORE_SYNC_RB   |    MI_SEMAPHORE_SYNC_VB   | MI_SEMAPHORE_SYNC_INVALID |    MI_SEMAPHORE_SYNC_VEB
+ * VECS |    MI_SEMAPHORE_SYNC_RVE  |    MI_SEMAPHORE_SYNC_VVE  |    MI_SEMAPHORE_SYNC_BVE  | MI_SEMAPHORE_SYNC_INVALID
+ *
+ * This distilled to integers looks like this:
+ *
+ *   |  0  |  1  |  2  |  3
+ * --+-----+-----+-----+-----
+ * 0 | -1  |  0  |  2  |  1
+ * 1 |  2  | -1  |  0  |  1
+ * 2 |  0  |  2  | -1  |  1
+ * 3 |  2  |  1  |  0  | -1
+ *
+ * In the opposite direction, the same table showing register addresses is:
+ *
+ *      |     RCS      |     VCS      |     BCS      |    VECS
+ * -----+--------------+--------------+--------------+--------------
+ *  RCS | GEN6_NOSYNC  | GEN6_RVSYNC  | GEN6_RBSYNC  | GEN6_RVESYNC
+ *  VCS | GEN6_VRSYNC  | GEN6_NOSYNC  | GEN6_VBSYNC  | GEN6_VVESYNC
+ *  BCS | GEN6_VRSYNC  | GEN6_BVSYNC  | GEN6_NOSYNC  | GEN6_BVESYNC
+ * VECS | GEN6_VERSYNC | GEN6_VEVSYNC | GEN6_VEBSYNC | GEN6_NOSYNC
+ *
+ * Again this distilled to integers looks like this:
+ *
+ *   |  0  |  1  |  2  |  3
+ * --+-----+-----+-----+-----
+ * 0 | -1  |  0  |  1  |  2
+ * 1 |  1  | -1  |  0  |  2
+ * 2 |  0  |  1  | -1  |  2
+ * 3 |  1  |  2  |  0  | -1
+ *
+ * The function gen6_sem_f expresses the above table. We also notice that the
Quoted 8 lines

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 260

Quoted 5 lines
drivers/gpu/drm/i915/intel_engine_cs.c +5 -0
+ * difference between the first and second tabe is only a transpose of ones to
+ * twos and twos to ones.
+ */
+
+static int gen6_sem_f(unsigned int x, unsigned int y)

gen6_sema_select
gen6_semaphore_flag

Pick one name to replace gen6_sem_f you mean?

Quoted 8 lines

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 266

Quoted 6 lines
drivers/gpu/drm/i915/intel_engine_cs.c +6 -0
+{
+	if (x == y)
+		return -1;
+
+	x = intel_engines[x].guc_id;
+	y = intel_engines[y].guc_id;

hw_id.

Some guys named Chris and Dave removed it. ;D

Quoted 9 lines

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 271

Quoted 6 lines
drivers/gpu/drm/i915/intel_engine_cs.c +5 -0
+
+	if (x >= I915_NUM_GEN6_SEMAPHORE_ENGINES ||
+	    y >= I915_NUM_GEN6_SEMAPHORE_ENGINES)
+		return -1;
+

/*
* X

Quoted 7 lines
  *      |  0  |  1  |  2  |  3
  *    --+-----+-----+-----+-----
  *    0 |     |  0  |  1  |  2
  * Y  1 |  1  |     |  0  |  2
  *    2 |  0  |  1  |     |  2
  *    3 |  1  |  2  |  0  |

*/

You want another copy of the table here?

Quoted 11 lines

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 279

Quoted 9 lines
drivers/gpu/drm/i915/intel_engine_cs.c +8 -0
+	x -= x >= y;
+	if (y == 1)
+		x = 3 - x;
+	x += y & 1;
+	return x % 3;
+}
+
+u32 gen6_wait_mbox(enum intel_engine_id x, enum intel_engine_id y)

static...

It is called from intel_ringbuffer.c.

Quoted 22 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_engine_cs.c +3 -0
+{
+	int r;
+

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 292

Quoted 10 lines
drivers/gpu/drm/i915/intel_engine_cs.c +10 -0
+	r = gen6_sem_f(x, y);
+	if (r < 0)
+		return MI_SEMAPHORE_SYNC_INVALID;
+
+	if (r == 1)
+		r = 2;
+	else if (r == 2)
+		r = 1;
+
+	return r << 16;

/* Convert semaphore sync field to its wait flag */ switch (gen6_sem_f(x, y)) {
case 0: return 0;
case 1: return 2 << 16;
case 2: return 1 << 16;
default: eturn MI_SEMAPHORE_SYNC_INVALID;

Quoted 1 line

}

Meh. :) Bike-shedding territory.

Quoted 6 lines

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 295

Quoted 4 lines
drivers/gpu/drm/i915/intel_engine_cs.c +3 -0
+}
+
+i915_reg_t gen6_signal_reg(enum intel_engine_id x, enum intel_engine_id y)

static...

The same as gen6_wait_mbox, called from intel_ringbuffer.c.

Quoted 10 lines

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 304

Quoted 9 lines
drivers/gpu/drm/i915/intel_engine_cs.c +9 -0
+{
+	int r;
+
+	r = gen6_sem_f(x, y);
+	if (r < 0)
+		return GEN6_NOSYNC;
+
+	return RING_SYNC(intel_engines[y].mmio_base, r);
+}

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw

On 21/07/16 14:16, Tvrtko Ursulin wrote:

[snip]

Quoted 10 lines
Quoted 8 lines

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 266

Quoted 6 lines
drivers/gpu/drm/i915/intel_engine_cs.c +6 -0
+{
+    if (x == y)
+        return -1;
+
+    x = intel_engines[x].guc_id;
+    y = intel_engines[y].guc_id;

hw_id.

Some guys named Chris and Dave removed it. ;D

I need to take this back, I was confusing two tables and some past discussions.

In this one we don't have hw_id.

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw
In reply to Tvrtko Ursulin
Quoted 117 lines · Tvrtko Ursulin
Quoted 6 lines · Chris Wilson
Quoted 5 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

Static table wastes space for invalid combinations and engines which are not supported by Gen6 (legacy semaphores).

Quoted 6 lines
Quoted 4 lines

Replace it with a function devised by Dave Gordon.

I have verified that it generates the same mappings between mbox selectors and signalling registers.

So just how big was that table? How big are the functions replacing it?

With I915_NUM_ENGINES of 5 table is 5 * 5 * (2 * 4) = 200 bytes.

With the patch .text grows by 144 bytes here and .rodata shrinks by
256. So a net gain of 112 bytes with my config. Conclusion is that as long as we got five engines it is not that interesting to get rid of the table.

Quoted 86 lines
Quoted 2 lines

v2: Add a comment describing what gen6_sem_f does.
v3: This time with git add.

I like having the table a lot... Even if we don't find the function convincing we should add that comment.

Quoted 80 lines
Cc Dave Gordon <[email protected]>
Cc Chris Wilson <[email protected]>
---
 drivers/gpu/drm/i915/i915_reg.h         |  7 +--
 drivers/gpu/drm/i915/intel_engine_cs.c  | 93 +++++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_ringbuffer.c | 40 +-------------
 drivers/gpu/drm/i915/intel_ringbuffer.h |  3 ++
 4 files changed, 102 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -3
index 9397ddec26b9..c2fe718582c8 100644
@@ -1604,9 +1604,10 @@ enum skl_disp_power_wells {
 #define RING_HEAD(base)		_MMIO((base)+0x34)
 #define RING_START(base)	_MMIO((base)+0x38)
 #define RING_CTL(base)		_MMIO((base)+0x3c)
-#define RING_SYNC_0(base)	_MMIO((base)+0x40)
-#define RING_SYNC_1(base)	_MMIO((base)+0x44)
-#define RING_SYNC_2(base)	_MMIO((base)+0x48)
+#define RING_SYNC(base, n)	_MMIO((base) + 0x40 + (n) * 4)
+#define RING_SYNC_0(base)	RING_SYNC(base, 0)
+#define RING_SYNC_1(base)	RING_SYNC(base, 1)
+#define RING_SYNC_2(base)	RING_SYNC(base, 2)
 #define GEN6_RVSYNC	(RING_SYNC_0(RENDER_RING_BASE))
 #define GEN6_RBSYNC	(RING_SYNC_1(RENDER_RING_BASE))
 #define GEN6_RVESYNC	(RING_SYNC_2(RENDER_RING_BASE))
drivers/gpu/drm/i915/intel_engine_cs.c +44 -0
index f4a35ec78481..19455b20b322 100644
@@ -209,3 +209,96 @@ int intel_engine_init_common(struct intel_engine_cs *engine)
 
 	return i915_cmd_parser_init_ring(engine);
 }
+
+#define I915_NUM_GEN6_SEMAPHORE_ENGINES (4)
+
+/*
+ * For Gen6 semaphores where the driver issues MI_SEMAPHORE_MBOX commands
+ * with register selects so that a specific engine can wake up another engine
+ * waiting on a matching register, the matrix of required register selects
+ * looks like this:
+ *
+ *      |            RCS            |           VCS             |           BCS             |         VECS
+ * -----+---------------------------+---------------------------+---------------------------+---------------------------
+ *  RCS | MI_SEMAPHORE_SYNC_INVALID |    MI_SEMAPHORE_SYNC_VR   |    MI_SEMAPHORE_SYNC_BR   |    MI_SEMAPHORE_SYNC_VER
+ *  VCS |    MI_SEMAPHORE_SYNC_RV   | MI_SEMAPHORE_SYNC_INVALID |    MI_SEMAPHORE_SYNC_BV   |    MI_SEMAPHORE_SYNC_VEV
+ *  BCS |    MI_SEMAPHORE_SYNC_RB   |    MI_SEMAPHORE_SYNC_VB   | MI_SEMAPHORE_SYNC_INVALID |    MI_SEMAPHORE_SYNC_VEB
+ * VECS |    MI_SEMAPHORE_SYNC_RVE  |    MI_SEMAPHORE_SYNC_VVE  |    MI_SEMAPHORE_SYNC_BVE  | MI_SEMAPHORE_SYNC_INVALID
+ *
+ * This distilled to integers looks like this:
+ *
+ *   |  0  |  1  |  2  |  3
+ * --+-----+-----+-----+-----
+ * 0 | -1  |  0  |  2  |  1
+ * 1 |  2  | -1  |  0  |  1
+ * 2 |  0  |  2  | -1  |  1
+ * 3 |  2  |  1  |  0  | -1
+ *
+ * In the opposite direction, the same table showing register addresses is:
+ *
+ *      |     RCS      |     VCS      |     BCS      |    VECS
+ * -----+--------------+--------------+--------------+--------------
+ *  RCS | GEN6_NOSYNC  | GEN6_RVSYNC  | GEN6_RBSYNC  | GEN6_RVESYNC
+ *  VCS | GEN6_VRSYNC  | GEN6_NOSYNC  | GEN6_VBSYNC  | GEN6_VVESYNC
+ *  BCS | GEN6_VRSYNC  | GEN6_BVSYNC  | GEN6_NOSYNC  | GEN6_BVESYNC
+ * VECS | GEN6_VERSYNC | GEN6_VEVSYNC | GEN6_VEBSYNC | GEN6_NOSYNC
+ *
+ * Again this distilled to integers looks like this:
+ *
+ *   |  0  |  1  |  2  |  3
+ * --+-----+-----+-----+-----
+ * 0 | -1  |  0  |  1  |  2
+ * 1 |  1  | -1  |  0  |  2
+ * 2 |  0  |  1  | -1  |  2
+ * 3 |  1  |  2  |  0  | -1
+ *
+ * The function gen6_sem_f expresses the above table. We also notice that the
Quoted 8 lines

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 260

Quoted 5 lines
drivers/gpu/drm/i915/intel_engine_cs.c +5 -0
+ * difference between the first and second tabe is only a transpose of ones to
+ * twos and twos to ones.
+ */
+
+static int gen6_sem_f(unsigned int x, unsigned int y)

gen6_sema_select
gen6_semaphore_flag

Quoted 1 line

Pick one name to replace gen6_sem_f you mean?

Yes, you contracted semaphore to sema last time (and that stuck). And by _f I assume you mean mathematical function, which is a little boring.

Quoted 10 lines
Quoted 8 lines

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 266

Quoted 6 lines
drivers/gpu/drm/i915/intel_engine_cs.c +6 -0
+{
+	if (x == y)
+		return -1;
+
+	x = intel_engines[x].guc_id;
+	y = intel_engines[y].guc_id;

hw_id.

Some guys named Chris and Dave removed it. ;D

I did?... I was aiming at removing guc_id! I was aware Dave was arguing against removing guc_id just in case the firmware differed in future from the existing gen5+ id.

Quoted 16 lines
Quoted 8 lines

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 271

Quoted 5 lines
drivers/gpu/drm/i915/intel_engine_cs.c +5 -0
+
+	if (x >= I915_NUM_GEN6_SEMAPHORE_ENGINES ||
+	    y >= I915_NUM_GEN6_SEMAPHORE_ENGINES)
+		return -1;
+

/*
* X

Quoted 7 lines
 *      |  0  |  1  |  2  |  3
 *    --+-----+-----+-----+-----
 *    0 |     |  0  |  1  |  2
 * Y  1 |  1  |     |  0  |  2
 *    2 |  0  |  1  |     |  2
 *    3 |  1  |  2  |  0  |

*/

Quoted 1 line

You want another copy of the table here?

Yes. In particular, I need to know which axis is X and which is Y. Having the table here is much easier to compare to the output of the code (same screen).

Quoted 11 lines
Quoted 10 lines

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 279

Quoted 8 lines
drivers/gpu/drm/i915/intel_engine_cs.c +8 -0
+	x -= x >= y;
+	if (y == 1)
+		x = 3 - x;
+	x += y & 1;
+	return x % 3;
+}
+
+u32 gen6_wait_mbox(enum intel_engine_id x, enum intel_engine_id y)

static...

Quoted 1 line

It is called from intel_ringbuffer.c.

Hmm. This was in intel_ringbuffer.c, at least I assumed so as this only applies to legacy submission, for gen6-7.

Quoted 21 lines
Quoted 21 lines

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 292

Quoted 13 lines
drivers/gpu/drm/i915/intel_engine_cs.c +13 -0
+{
+	int r;
+
+	r = gen6_sem_f(x, y);
+	if (r < 0)
+		return MI_SEMAPHORE_SYNC_INVALID;
+
+	if (r == 1)
+		r = 2;
+	else if (r == 2)
+		r = 1;
+
+	return r << 16;

/* Convert semaphore sync field to its wait flag */ switch (gen6_sem_f(x, y)) {
case 0: return 0;
case 1: return 2 << 16;
case 2: return 1 << 16;
default: eturn MI_SEMAPHORE_SYNC_INVALID;

Quoted 3 lines
Quoted 1 line

}

Meh. :) Bike-shedding territory.

I know which I found easier to understand ;)
-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#11 lore raw
Quoted 118 lines · Chris Wilson
Quoted 117 lines · Tvrtko Ursulin
Quoted 6 lines · Chris Wilson
Quoted 5 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

Static table wastes space for invalid combinations and engines which are not supported by Gen6 (legacy semaphores).

Quoted 6 lines
Quoted 4 lines

Replace it with a function devised by Dave Gordon.

I have verified that it generates the same mappings between mbox selectors and signalling registers.

So just how big was that table? How big are the functions replacing it?

With I915_NUM_ENGINES of 5 table is 5 * 5 * (2 * 4) = 200 bytes.

With the patch .text grows by 144 bytes here and .rodata shrinks by
256. So a net gain of 112 bytes with my config. Conclusion is that as long as we got five engines it is not that interesting to get rid of the table.

Quoted 94 lines
Quoted 2 lines

v2: Add a comment describing what gen6_sem_f does.
v3: This time with git add.

I like having the table a lot... Even if we don't find the function convincing we should add that comment.

Quoted 75 lines
Cc Dave Gordon <[email protected]>
Cc Chris Wilson <[email protected]>
---
  drivers/gpu/drm/i915/i915_reg.h         |  7 +--
  drivers/gpu/drm/i915/intel_engine_cs.c  | 93 +++++++++++++++++++++++++++++++++
  drivers/gpu/drm/i915/intel_ringbuffer.c | 40 +-------------
  drivers/gpu/drm/i915/intel_ringbuffer.h |  3 ++
  4 files changed, 102 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -3
index 9397ddec26b9..c2fe718582c8 100644
@@ -1604,9 +1604,10 @@ enum skl_disp_power_wells {
  #define RING_HEAD(base)		_MMIO((base)+0x34)
  #define RING_START(base)	_MMIO((base)+0x38)
  #define RING_CTL(base)		_MMIO((base)+0x3c)
-#define RING_SYNC_0(base)	_MMIO((base)+0x40)
-#define RING_SYNC_1(base)	_MMIO((base)+0x44)
-#define RING_SYNC_2(base)	_MMIO((base)+0x48)
+#define RING_SYNC(base, n)	_MMIO((base) + 0x40 + (n) * 4)
+#define RING_SYNC_0(base)	RING_SYNC(base, 0)
+#define RING_SYNC_1(base)	RING_SYNC(base, 1)
+#define RING_SYNC_2(base)	RING_SYNC(base, 2)
  #define GEN6_RVSYNC	(RING_SYNC_0(RENDER_RING_BASE))
  #define GEN6_RBSYNC	(RING_SYNC_1(RENDER_RING_BASE))
  #define GEN6_RVESYNC	(RING_SYNC_2(RENDER_RING_BASE))
drivers/gpu/drm/i915/intel_engine_cs.c +39 -0
index f4a35ec78481..19455b20b322 100644
@@ -209,3 +209,96 @@ int intel_engine_init_common(struct intel_engine_cs *engine)
 
  	return i915_cmd_parser_init_ring(engine);
  }
+
+#define I915_NUM_GEN6_SEMAPHORE_ENGINES (4)
+
+/*
+ * For Gen6 semaphores where the driver issues MI_SEMAPHORE_MBOX commands
+ * with register selects so that a specific engine can wake up another engine
+ * waiting on a matching register, the matrix of required register selects
+ * looks like this:
+ *
+ *      |            RCS            |           VCS             |           BCS             |         VECS
+ * -----+---------------------------+---------------------------+---------------------------+---------------------------
+ *  RCS | MI_SEMAPHORE_SYNC_INVALID |    MI_SEMAPHORE_SYNC_VR   |    MI_SEMAPHORE_SYNC_BR   |    MI_SEMAPHORE_SYNC_VER
+ *  VCS |    MI_SEMAPHORE_SYNC_RV   | MI_SEMAPHORE_SYNC_INVALID |    MI_SEMAPHORE_SYNC_BV   |    MI_SEMAPHORE_SYNC_VEV
+ *  BCS |    MI_SEMAPHORE_SYNC_RB   |    MI_SEMAPHORE_SYNC_VB   | MI_SEMAPHORE_SYNC_INVALID |    MI_SEMAPHORE_SYNC_VEB
+ * VECS |    MI_SEMAPHORE_SYNC_RVE  |    MI_SEMAPHORE_SYNC_VVE  |    MI_SEMAPHORE_SYNC_BVE  | MI_SEMAPHORE_SYNC_INVALID
+ *
+ * This distilled to integers looks like this:
+ *
+ *   |  0  |  1  |  2  |  3
+ * --+-----+-----+-----+-----
+ * 0 | -1  |  0  |  2  |  1
+ * 1 |  2  | -1  |  0  |  1
+ * 2 |  0  |  2  | -1  |  1
+ * 3 |  2  |  1  |  0  | -1
+ *
+ * In the opposite direction, the same table showing register addresses is:
+ *
+ *      |     RCS      |     VCS      |     BCS      |    VECS
+ * -----+--------------+--------------+--------------+--------------
+ *  RCS | GEN6_NOSYNC  | GEN6_RVSYNC  | GEN6_RBSYNC  | GEN6_RVESYNC
+ *  VCS | GEN6_VRSYNC  | GEN6_NOSYNC  | GEN6_VBSYNC  | GEN6_VVESYNC
+ *  BCS | GEN6_VRSYNC  | GEN6_BVSYNC  | GEN6_NOSYNC  | GEN6_BVESYNC
+ * VECS | GEN6_VERSYNC | GEN6_VEVSYNC | GEN6_VEBSYNC | GEN6_NOSYNC
+ *
+ * Again this distilled to integers looks like this:
+ *
+ *   |  0  |  1  |  2  |  3
+ * --+-----+-----+-----+-----
+ * 0 | -1  |  0  |  1  |  2

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 260

Quoted 10 lines
drivers/gpu/drm/i915/intel_engine_cs.c +10 -0
+ * 1 |  1  | -1  |  0  |  2
+ * 2 |  0  |  1  | -1  |  2
+ * 3 |  1  |  2  |  0  | -1
+ *
+ * The function gen6_sem_f expresses the above table. We also notice that the
+ * difference between the first and second tabe is only a transpose of ones to
+ * twos and twos to ones.
+ */
+
+static int gen6_sem_f(unsigned int x, unsigned int y)

gen6_sema_select
gen6_semaphore_flag

Quoted 4 lines
Quoted 1 line

Pick one name to replace gen6_sem_f you mean?

Yes, you contracted semaphore to sema last time (and that stuck). And by _f I assume you mean mathematical function, which is a little boring.

Yes, and boring or not it is wrong since it is not a pure mathematical function so I will rename it.

Quoted 9 lines
Quoted 9 lines
Quoted 8 lines

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 266

Quoted 6 lines
drivers/gpu/drm/i915/intel_engine_cs.c +6 -0
+{
+	if (x == y)
+		return -1;
+
+	x = intel_engines[x].guc_id;
+	y = intel_engines[y].guc_id;

hw_id.

Quoted 5 lines
Quoted 1 line

Some guys named Chris and Dave removed it. ;D

I did?... I was aiming at removing guc_id! I was aware Dave was arguing against removing guc_id just in case the firmware differed in future from the existing gen5+ id.

I retracted that comment later, just confused things.

Quoted 16 lines
Quoted 16 lines
Quoted 15 lines

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 271

Quoted 5 lines
drivers/gpu/drm/i915/intel_engine_cs.c +5 -0
+
+	if (x >= I915_NUM_GEN6_SEMAPHORE_ENGINES ||
+	    y >= I915_NUM_GEN6_SEMAPHORE_ENGINES)
+		return -1;
+

/*
* X

  *      |  0  |  1  |  2  |  3
  *    --+-----+-----+-----+-----
  *    0 |     |  0  |  1  |  2
  * Y  1 |  1  |     |  0  |  2
  *    2 |  0  |  1  |     |  2
  *    3 |  1  |  2  |  0  |

*/

Quoted 5 lines
Quoted 1 line

You want another copy of the table here?

Yes. In particular, I need to know which axis is X and which is Y. Having the table here is much easier to compare to the output of the code (same screen).

Ok.

Quoted 11 lines
Quoted 11 lines
Quoted 10 lines

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 279

Quoted 8 lines
drivers/gpu/drm/i915/intel_engine_cs.c +8 -0
+	x -= x >= y;
+	if (y == 1)
+		x = 3 - x;
+	x += y & 1;
+	return x % 3;
+}
+
+u32 gen6_wait_mbox(enum intel_engine_id x, enum intel_engine_id y)

static...

Quoted 4 lines
Quoted 1 line

It is called from intel_ringbuffer.c.

Hmm. This was in intel_ringbuffer.c, at least I assumed so as this only applies to legacy submission, for gen6-7.

It uses the static intel_engines array since the dev_priv->engines are not initialized yet by the time it runs, for an engine.

Could as an alternative make the engine init phase multi-pass. Maybe. Not sure what repercussions for the cleanup path that would have.

Regards,

Tvrtko

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#12 lore raw
Quoted 7 lines · Tvrtko Ursulin
Quoted 2 lines · Chris Wilson

Hmm. This was in intel_ringbuffer.c, at least I assumed so as this only applies to legacy submission, for gen6-7.

It uses the static intel_engines array since the dev_priv->engines are not initialized yet by the time it runs, for an engine.

Hmm, right.

Quoted 3 lines

Could as an alternative make the engine init phase multi-pass. Maybe. Not sure what repercussions for the cleanup path that would have.

Or expose the intel_engines[] array. Double pass (setup, then init) is better than exposing the array. I think I am preferring that and trying to keep the semaphore logic in the intel_ringbuffer.c silo. -Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#13 lore raw
In reply to Tvrtko Ursulin
Quoted 16 lines · Tvrtko Ursulin
Quoted 14 lines · Chris Wilson
Quoted 13 lines · Tvrtko Ursulin
Quoted 11 lines · Chris Wilson
Quoted 9 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

Static table wastes space for invalid combinations and engines which are not supported by Gen6 (legacy semaphores).

Replace it with a function devised by Dave Gordon.

I have verified that it generates the same mappings between mbox selectors and signalling registers.

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 1 line

So just how big was that table? How big are the functions replacing it?

With I915_NUM_ENGINES of 5 table is 5 * 5 * (2 * 4) = 200 bytes.

With the patch .text grows by 144 bytes here and .rodata shrinks by
256. So a net gain of 112 bytes with my config. Conclusion is that as long as we got five engines it is not that interesting to get rid of the table.

Since the semaphore matrix is only relevant to a specific gen, you could remove it from the multi-generational engine-list and instead just have it in the gen-specific code that needs it. That way it won't continue to grow as new engines are added. The one gen that needs it is fixed at 4x4, so it could just be a 16-byte lookup table, or 32 bits (0b11001001_10110001_00101101_10010011) if you really want to save space ;-)

Quoted 72 lines
Quoted 72 lines
Quoted 72 lines
Quoted 72 lines
Quoted 2 lines

v2: Add a comment describing what gen6_sem_f does.
v3: This time with git add.

I like having the table a lot... Even if we don't find the function convincing we should add that comment.

Quoted 66 lines
Cc Dave Gordon <[email protected]>
Cc Chris Wilson <[email protected]>
---
  drivers/gpu/drm/i915/i915_reg.h         |  7 +--
  drivers/gpu/drm/i915/intel_engine_cs.c  | 93
+++++++++++++++++++++++++++++++++
  drivers/gpu/drm/i915/intel_ringbuffer.c | 40 +-------------
  drivers/gpu/drm/i915/intel_ringbuffer.h |  3 ++
  4 files changed, 102 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -3
index 9397ddec26b9..c2fe718582c8 100644
@@ -1604,9 +1604,10 @@ enum skl_disp_power_wells {
  #define RING_HEAD(base)        _MMIO((base)+0x34)
  #define RING_START(base)    _MMIO((base)+0x38)
  #define RING_CTL(base)        _MMIO((base)+0x3c)
-#define RING_SYNC_0(base)    _MMIO((base)+0x40)
-#define RING_SYNC_1(base)    _MMIO((base)+0x44)
-#define RING_SYNC_2(base)    _MMIO((base)+0x48)
+#define RING_SYNC(base, n)    _MMIO((base) + 0x40 + (n) * 4)
+#define RING_SYNC_0(base)    RING_SYNC(base, 0)
+#define RING_SYNC_1(base)    RING_SYNC(base, 1)
+#define RING_SYNC_2(base)    RING_SYNC(base, 2)
  #define GEN6_RVSYNC    (RING_SYNC_0(RENDER_RING_BASE))
  #define GEN6_RBSYNC    (RING_SYNC_1(RENDER_RING_BASE))
  #define GEN6_RVESYNC    (RING_SYNC_2(RENDER_RING_BASE))
drivers/gpu/drm/i915/intel_engine_cs.c +5 -0
index f4a35ec78481..19455b20b322 100644
@@ -209,3 +209,96 @@ int intel_engine_init_common(struct
 intel_engine_cs *engine)
 
      return i915_cmd_parser_init_ring(engine);
  }
+
+#define I915_NUM_GEN6_SEMAPHORE_ENGINES (4)
+
+/*
+ * For Gen6 semaphores where the driver issues MI_SEMAPHORE_MBOX

commands
+ * with register selects so that a specific engine can wake up another engine
+ * waiting on a matching register, the matrix of required register selects
+ * looks like this:
+ *
+ * | RCS | VCS
| BCS | VECS
+ *
-----+---------------------------+---------------------------+---------------------------+---------------------------

+ *  RCS | MI_SEMAPHORE_SYNC_INVALID |    MI_SEMAPHORE_SYNC_VR
|    MI_SEMAPHORE_SYNC_BR   |    MI_SEMAPHORE_SYNC_VER
+ *  VCS |    MI_SEMAPHORE_SYNC_RV   | MI_SEMAPHORE_SYNC_INVALID
|    MI_SEMAPHORE_SYNC_BV   |    MI_SEMAPHORE_SYNC_VEV
+ *  BCS |    MI_SEMAPHORE_SYNC_RB   |    MI_SEMAPHORE_SYNC_VB   |

MI_SEMAPHORE_SYNC_INVALID | MI_SEMAPHORE_SYNC_VEB
+ * VECS | MI_SEMAPHORE_SYNC_RVE | MI_SEMAPHORE_SYNC_VVE
| MI_SEMAPHORE_SYNC_BVE | MI_SEMAPHORE_SYNC_INVALID
+ *

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

+ * This distilled to integers looks like this:
+ *
+ * | 0 | 1 | 2 | 3
+ * --+-----+-----+-----+-----

+ * 0 | -1  |  0  |  2  |  1
+ * 1 |  2  | -1  |  0  |  1
+ * 2 |  0  |  2  | -1  |  1
+ * 3 |  2  |  1  |  0  | -1

Actually (and conveniently) MI_SEMAPHORE_SYNC_INVALID is 3 (<<16) so we don't really need to return -1 and then map it to INVALID, we can just use 0-3 directly. The binary string I wrote above represents this table; then to get the result we want it just has to be shifted.

Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines

+ *
+ * In the opposite direction, the same table showing register addresses is:
+ *
+ * | RCS | VCS | BCS | VECS
+ * -----+--------------+--------------+--------------+--------------

+ *  RCS | GEN6_NOSYNC  | GEN6_RVSYNC  | GEN6_RBSYNC  | GEN6_RVESYNC
+ *  VCS | GEN6_VRSYNC  | GEN6_NOSYNC  | GEN6_VBSYNC  | GEN6_VVESYNC
+ *  BCS | GEN6_VRSYNC  | GEN6_BVSYNC  | GEN6_NOSYNC  | GEN6_BVESYNC
+ * VECS | GEN6_VERSYNC | GEN6_VEVSYNC | GEN6_VEBSYNC | GEN6_NOSYNC

+ *

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

+ * Again this distilled to integers looks like this:
+ *
+ * | 0 | 1 | 2 | 3
+ * --+-----+-----+-----+-----

+ * 0 | -1  |  0  |  1  |  2
+ * 1 |  1  | -1  |  0  |  2
+ * 2 |  0  |  1  | -1  |  2
+ * 3 |  1  |  2  |  0  | -1

With that table as the first function f1(returning 0-3), the second function could just be a lookup in a 4-entry array indexed by the result. Or convert 3 to NOSYNC, then the rest is (3-f1(x,y)) % 3.

I think those might give the best combination of code+data size :)

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines

/*
* X

  *      |  0  |  1  |  2  |  3
  *    --+-----+-----+-----+-----
  *    0 |     |  0  |  1  |  2
  * Y  1 |  1  |     |  0  |  2
  *    2 |  0  |  1  |     |  2
  *    3 |  1  |  2  |  0  |

*/

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

You want another copy of the table here?

Yes. In particular, I need to know which axis is X and which is Y. Having the table here is much easier to compare to the output of the code (same screen).

Ok.

Let's call them 'from' and 'to' (or 'signaller' and 'waiter', though that's rather long) rather than x & y,

.Dave.

Quoted 16 lines
Quoted 11 lines
Quoted 11 lines
Quoted 10 lines

drivers/gpu/drm/i915/intel_engine_cs.c int intel_engine_init_common(struct intel_engine_cs *engine) · line 279

Quoted 8 lines
drivers/gpu/drm/i915/intel_engine_cs.c +8 -0
+    x -= x >= y;
+    if (y == 1)
+        x = 3 - x;
+    x += y & 1;
+    return x % 3;
+}
+
+u32 gen6_wait_mbox(enum intel_engine_id x, enum intel_engine_id y)

static...

Quoted 4 lines
Quoted 1 line

It is called from intel_ringbuffer.c.

Hmm. This was in intel_ringbuffer.c, at least I assumed so as this only applies to legacy submission, for gen6-7.

Quoted 8 lines

It uses the static intel_engines array since the dev_priv->engines are not initialized yet by the time it runs, for an engine.

Could as an alternative make the engine init phase multi-pass. Maybe. Not sure what repercussions for the cleanup path that would have.

Regards,
Tvrtko

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#14 lore raw
Quoted 26 lines · Dave Gordon
Quoted 18 lines · Tvrtko Ursulin
Quoted 17 lines · Chris Wilson
Quoted 16 lines · Tvrtko Ursulin
Quoted 13 lines · Chris Wilson
Quoted 9 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

Static table wastes space for invalid combinations and engines which are not supported by Gen6 (legacy semaphores).

Replace it with a function devised by Dave Gordon.

I have verified that it generates the same mappings between mbox selectors and signalling registers.

So just how big was that table? How big are the functions replacing it?

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

With I915_NUM_ENGINES of 5 table is 5 * 5 * (2 * 4) = 200 bytes.

With the patch .text grows by 144 bytes here and .rodata shrinks by
256. So a net gain of 112 bytes with my config. Conclusion is that as long as we got five engines it is not that interesting to get rid of the table.

Quoted 7 lines

Since the semaphore matrix is only relevant to a specific gen, you could remove it from the multi-generational engine-list and instead just have it in the gen-specific code that needs it. That way it won't continue to grow as new engines are added. The one gen that needs it is fixed at 4x4, so it could just be a 16-byte lookup table, or 32 bits (0b11001001_10110001_00101101_10010011) if you really want to save space ;-)

Not so much save space today as prevent from it exploding in the future.

Rewriting the table to use hw_ids sounds like the best idea so far so I'll go with that.

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#15 lore raw
Quoted 36 lines · Tvrtko Ursulin
Quoted 26 lines · Dave Gordon
Quoted 18 lines · Tvrtko Ursulin
Quoted 17 lines · Chris Wilson
Quoted 16 lines · Tvrtko Ursulin
Quoted 13 lines · Chris Wilson
Quoted 9 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

Static table wastes space for invalid combinations and engines which are not supported by Gen6 (legacy semaphores).

Replace it with a function devised by Dave Gordon.

I have verified that it generates the same mappings between mbox selectors and signalling registers.

So just how big was that table? How big are the functions replacing it?

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

With I915_NUM_ENGINES of 5 table is 5 * 5 * (2 * 4) = 200 bytes.

With the patch .text grows by 144 bytes here and .rodata shrinks by
256. So a net gain of 112 bytes with my config. Conclusion is that as long as we got five engines it is not that interesting to get rid of the table.

Quoted 7 lines

Since the semaphore matrix is only relevant to a specific gen, you could remove it from the multi-generational engine-list and instead just have it in the gen-specific code that needs it. That way it won't continue to grow as new engines are added. The one gen that needs it is fixed at 4x4, so it could just be a 16-byte lookup table, or 32 bits (0b11001001_10110001_00101101_10010011) if you really want to save space ;-)

Quoted 8 lines

Not so much save space today as prevent from it exploding in the future.

Rewriting the table to use hw_ids sounds like the best idea so far so I'll go with that.

Regards,

Tvrtko

+ * This distilled to integers looks like this:
+ *
+ * | 0 | 1 | 2 | 3
+ * --+-----+-----+-----+-----

+ * 0 | -1  |  0  |  2  |  1
+ * 1 |  2  | -1  |  0  |  1
+ * 2 |  0  |  2  | -1  |  1
+ * 3 |  2  |  1  |  0  | -1

static unsigned int sem_wait_mbox(unsigned int x, unsigned int y)

{
	const unsigned int z = 0b11000110011110000100111001100011;

	return (z >> (8*y + 2*x)) & 3;
}
         x
      0 1 2 3
      -------
  0:  3 0 2 1
y 1:  2 3 0 1
  2:  0 2 3 1
  3:  2 1 0 3

No complicated code, and hardly any table :)

.Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#16 lore raw

✗ Ro.CI.BAT: failure for drm/i915: Replace gen6 semaphore signal table with code (rev2)

In reply to Tvrtko Ursulin
== Series Details ==

== Series Details ==

Series: drm/i915: Replace gen6 semaphore signal table with code (rev2)
URL : https://patchwork.freedesktop.org/series/10129/
State : failure

== Summary ==

Series 10129v2 drm/i915: Replace gen6 semaphore signal table with code
http://patchwork.freedesktop.org/api/1.0/series/10129/revisions/2/mbox

Test gem_exec_suspend:

        Subgroup basic-s3:
                incomplete -> PASS       (fi-skl-i7-6700k)
Test gem_sync:
        Subgroup basic-store-each:
                pass       -> FAIL       (ro-bdw-i7-5600u)
fi-hsw-i7-4770k  total:244  pass:216  dwarn:0   dfail:0   fail:8   skip:20 
fi-kbl-qkkr      total:244  pass:180  dwarn:29  dfail:0   fail:8   skip:27 
fi-skl-i5-6260u  total:244  pass:224  dwarn:0   dfail:0   fail:8   skip:12 
fi-skl-i7-6700k  total:244  pass:210  dwarn:0   dfail:0   fail:8   skip:26 
fi-snb-i7-2600   total:244  pass:196  dwarn:0   dfail:0   fail:8   skip:40 
ro-bdw-i5-5250u  total:244  pass:219  dwarn:4   dfail:0   fail:8   skip:13 
ro-bdw-i7-5557U  total:244  pass:220  dwarn:2   dfail:0   fail:8   skip:14 
ro-bdw-i7-5600u  total:244  pass:203  dwarn:0   dfail:0   fail:9   skip:32 
ro-bsw-n3050     total:218  pass:173  dwarn:0   dfail:0   fail:2   skip:42 
ro-byt-n2820     total:244  pass:197  dwarn:0   dfail:0   fail:9   skip:38 
ro-hsw-i7-4770r  total:244  pass:212  dwarn:0   dfail:0   fail:8   skip:24 
ro-ilk-i7-620lm  total:244  pass:172  dwarn:0   dfail:0   fail:9   skip:63 
ro-ilk1-i5-650   total:239  pass:172  dwarn:0   dfail:0   fail:9   skip:58 
ro-ivb-i7-3770   total:244  pass:203  dwarn:0   dfail:0   fail:8   skip:33 
ro-skl3-i5-6260u total:244  pass:224  dwarn:0   dfail:0   fail:8   skip:12 
ro-snb-i7-2620M  total:244  pass:193  dwarn:0   dfail:0   fail:9   skip:42 

ro-hsw-i3-4010u failed to connect after reboot

Results at /archive/results/CI_IGT_test/RO_Patchwork_1560/

784a7749 drm-intel-nightly: 2016y-07m-21d-09h-00m-52s UTC integration manifest 7066ba0 drm/i915: Replace gen6 semaphore signal table with code

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#17 lore raw

✗ Ro.CI.BAT: failure for drm/i915: Replace gen6 semaphore signal table with code (rev3)

In reply to Tvrtko Ursulin
== Series Details ==

== Series Details ==

Series: drm/i915: Replace gen6 semaphore signal table with code (rev3)
URL : https://patchwork.freedesktop.org/series/10129/
State : failure

== Summary ==

Series 10129v3 drm/i915: Replace gen6 semaphore signal table with code
http://patchwork.freedesktop.org/api/1.0/series/10129/revisions/3/mbox

Test gem_exec_suspend:

        Subgroup basic-s3:
                pass       -> DMESG-WARN (ro-skl3-i5-6260u)
                incomplete -> PASS       (fi-skl-i7-6700k)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                pass       -> INCOMPLETE (fi-hsw-i7-4770k)
                skip       -> DMESG-WARN (ro-bdw-i7-5557U)
fi-hsw-i7-4770k  total:196  pass:177  dwarn:0   dfail:0   fail:0   skip:18 
fi-kbl-qkkr      total:244  pass:179  dwarn:29  dfail:0   fail:8   skip:28 
fi-skl-i5-6260u  total:244  pass:224  dwarn:0   dfail:0   fail:8   skip:12 
fi-skl-i7-6700k  total:244  pass:210  dwarn:0   dfail:0   fail:8   skip:26 
fi-snb-i7-2600   total:244  pass:196  dwarn:0   dfail:0   fail:8   skip:40 
ro-bdw-i5-5250u  total:244  pass:219  dwarn:4   dfail:0   fail:8   skip:13 
ro-bdw-i7-5557U  total:244  pass:220  dwarn:3   dfail:0   fail:8   skip:13 
ro-bdw-i7-5600u  total:244  pass:204  dwarn:0   dfail:0   fail:8   skip:32 
ro-bsw-n3050     total:218  pass:173  dwarn:0   dfail:0   fail:2   skip:42 
ro-byt-n2820     total:244  pass:197  dwarn:0   dfail:0   fail:9   skip:38 
ro-hsw-i3-4010u  total:244  pass:212  dwarn:0   dfail:0   fail:8   skip:24 
ro-hsw-i7-4770r  total:244  pass:212  dwarn:0   dfail:0   fail:8   skip:24 
ro-ilk-i7-620lm  total:244  pass:172  dwarn:0   dfail:0   fail:9   skip:63 
ro-ilk1-i5-650   total:239  pass:172  dwarn:0   dfail:0   fail:9   skip:58 
ro-ivb-i7-3770   total:244  pass:203  dwarn:0   dfail:0   fail:8   skip:33 
ro-skl3-i5-6260u total:244  pass:223  dwarn:1   dfail:0   fail:8   skip:12 
ro-snb-i7-2620M  total:244  pass:193  dwarn:0   dfail:0   fail:9   skip:42 

Results at /archive/results/CI_IGT_test/RO_Patchwork_1561/

784a7749 drm-intel-nightly: 2016y-07m-21d-09h-00m-52s UTC integration manifest 5ecf6c4 drm/i915: Replace gen6 semaphore signal table with code

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx