drm/i915: Move semaphore specific ring members to struct
Subsystems (2)
PATCH 1/13 drm/i915: Move semaphore specific ring members to struct
This will be helpful in abstracting some of the code in preparation for gen8 semaphores.
v2: Move mbox stuff to a separate struct
--- drivers/gpu/drm/i915/i915_gem.c | 10 ++-- drivers/gpu/drm/i915/i915_gpu_error.c | 6 +-- drivers/gpu/drm/i915/intel_ringbuffer.c | 87 ++++++++++++++++----------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 19 ++++--- 4 files changed, 63 insertions(+), 59 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +5 -5
@@ -2089,8 +2089,8 @@ i915_gem_init_seqno(struct drm_device *dev, u32 seqno)for_each_ring (ring, dev_priv, i) {intel_ring_init_seqno (ring, seqno); -for (j =0 ; j <ARRAY_SIZE (ring->sync_seqno); j++) - ring->sync_seqno[j] =0 ; +for (j =0 ; j <ARRAY_SIZE (ring->semaphore.sync_seqno); j++) + ring->semaphore.sync_seqno[j] =0 ; }return 0 ;
@@ -2661,7 +2661,7 @@ i915_gem_object_sync(struct drm_i915_gem_object *obj, idx =intel_ring_sync_index (from, to); seqno = obj->last_read_seqno; -if (seqno <= from->sync_seqno[idx]) +if (seqno <= from->semaphore.sync_seqno[idx])return 0 ; ret =i915_gem_check_olr (obj->ring, seqno);
@@ -2669,13 +2669,13 @@ i915_gem_object_sync(struct drm_i915_gem_object *obj,return ret;trace_i915_gem_ring_sync_to (from, to, seqno); - ret = to->sync_to (to, from, seqno); + ret = to->semaphore.sync_to (to, from, seqno);if (!ret)/* We use last_read_seqno because sync_to() * might have just caused seqno wrap under * the radar. */ - from->sync_seqno[idx] = obj->last_read_seqno; + from->semaphore.sync_seqno[idx] = obj->last_read_seqno;return ret; }
drivers/gpu/drm/i915/i915_gpu_error.c +3 -3
@@ -810,14 +810,14 @@ static void i915_record_ring_state(struct drm_device *dev, = I915_READ(RING_SYNC_0(ring->mmio_base)); ering->semaphore_mboxes[1 ] =I915_READ (RING_SYNC_1 (ring->mmio_base)); - ering->semaphore_seqno[0 ] = ring->sync_seqno[0 ]; - ering->semaphore_seqno[1 ] = ring->sync_seqno[1 ]; + ering->semaphore_seqno[0 ] = ring->semaphore.sync_seqno[0 ]; + ering->semaphore_seqno[1 ] = ring->semaphore.sync_seqno[1 ]; }if (HAS_VEBOX (dev)) { ering->semaphore_mboxes[2 ] =I915_READ (RING_SYNC_2 (ring->mmio_base)); - ering->semaphore_seqno[2 ] = ring->sync_seqno[2 ]; + ering->semaphore_seqno[2 ] = ring->semaphore.sync_seqno[2 ]; }if (INTEL_INFO (dev)->gen >=4 ) {
drivers/gpu/drm/i915/intel_ringbuffer.c +43 -44
144 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +12 -7
@@ -85,7 +85,6 @@ struct intel_ring_buffer {unsigned irq_refcount;/* protected by dev_priv->irq_lock */ u32 irq_enable_mask;/* bitmask to enable ring interrupt */ u32 trace_irq_seqno; -u32 sync_seqno[I915_NUM_RINGS -1 ];bool __must_check (*irq_get)(struct intel_ring_buffer *ring);void (*irq_put)(struct intel_ring_buffer *ring);
@@ -113,14 +112,20 @@ struct intel_ring_buffer {#define I915_DISPATCH_SECURE 0x1#define I915_DISPATCH_PINNED 0x2void (*cleanup)(struct intel_ring_buffer *ring); -int (*sync_to)(struct intel_ring_buffer *ring, + +struct { +u32 sync_seqno[I915_NUM_RINGS -1 ]; +/* AKA wait() */ +int (*sync_to)(struct intel_ring_buffer *ring,struct intel_ring_buffer *to,u32 seqno); - -/* our mbox written by others */ -u32 semaphore_register[I915_NUM_RINGS ]; -/* mboxes this ring signals to */ -u32 signal_mbox[I915_NUM_RINGS ]; +struct { +/* our mbox written by others */ +u32 wait[I915_NUM_RINGS ]; +/* mboxes this ring signals to */ +u32 signal[I915_NUM_RINGS ]; + } mbox; + } semaphore;/** * List of objects currently involved in rendering from the
Signature · 6 lines
1.9.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/13 drm/i915: Virtualize the ringbuffer signal func
This abstraction again is in preparation for gen8. Gen8 will bring new semantics for doing this operation.
While here, make the writes of MI_NOOPs explicit for non-existent rings. This should have been implicit before.
NOTE: This is going to be removed in a few patches.
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 42 ++++++++++++++++++++------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 11 +++++---- 2 files changed, 32 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +25 -17
@@ -634,20 +634,32 @@ static void render_ring_cleanup(struct intel_ring_buffer *ring) ring->scratch.obj =NULL ; } -static void -update_mboxes (struct intel_ring_buffer *ring, -u32 mmio_offset) +static void gen6_signal (struct intel_ring_buffer *signaller) { +struct drm_i915_private *dev_priv = signaller->dev->dev_private; +struct intel_ring_buffer *useless; +int i; +/* NB: In order to be able to do semaphore MBOX updates for varying number * of rings, it's easiest if we round up each individual update to a * multiple of 2 (since ring updates must always be a multiple of 2) * even though the actual update only requires 3 dwords. */ #define MBOX_UPDATE_DWORDS 4 -intel_ring_emit (ring,MI_LOAD_REGISTER_IMM (1 )); -intel_ring_emit (ring, mmio_offset); -intel_ring_emit (ring, ring->outstanding_lazy_seqno); -intel_ring_emit (ring,MI_NOOP ); +for_each_ring (useless, dev_priv, i) { +u32 mbox_reg = signaller->semaphore.mbox.signal[i]; +if (mbox_reg !=GEN6_NOSYNC ) { +intel_ring_emit (signaller,MI_LOAD_REGISTER_IMM (1 )); +intel_ring_emit (signaller, mbox_reg); +intel_ring_emit (signaller, signaller->outstanding_lazy_seqno); +intel_ring_emit (signaller,MI_NOOP ); + }else { +intel_ring_emit (signaller,MI_NOOP ); +intel_ring_emit (signaller,MI_NOOP ); +intel_ring_emit (signaller,MI_NOOP ); +intel_ring_emit (signaller,MI_NOOP ); + } + } }/**
@@ -663,9 +675,7 @@ static int gen6_add_request(struct intel_ring_buffer *ring) {struct drm_device *dev = ring->dev; -struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_ring_buffer *useless; -int i, ret, num_dwords =4 ; +int ret, num_dwords =4 ;if (i915_semaphore_is_enabled (dev)) num_dwords += ((I915_NUM_RINGS -1 ) *MBOX_UPDATE_DWORDS );
@@ -675,13 +685,7 @@ gen6_add_request(struct intel_ring_buffer *ring)if (ret)return ret; -if (i915_semaphore_is_enabled (dev)) { -for_each_ring (useless, dev_priv, i) { -u32 mbox_reg = ring->semaphore.mbox.signal[i]; -if (mbox_reg !=GEN6_NOSYNC ) -update_mboxes (ring, mbox_reg); - } - } + ring->semaphore.signal (ring);intel_ring_emit (ring,MI_STORE_DWORD_INDEX );intel_ring_emit (ring,I915_GEM_HWS_INDEX <<MI_STORE_DWORD_INDEX_SHIFT );
@@ -1881,6 +1885,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev) ring->get_seqno = gen6_ring_get_seqno; ring->set_seqno = ring_set_seqno; ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_INVALID ; ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_RV ; ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_RB ;
@@ -2057,6 +2062,7 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) gen6_ring_dispatch_execbuffer; } ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_VR ; ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_INVALID ; ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_VB ;
@@ -2114,6 +2120,7 @@ int intel_init_blt_ring_buffer(struct drm_device *dev) ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer; } ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_BR ; ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_BV ; ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_INVALID ;
@@ -2155,6 +2162,7 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev) ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer; } ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_VER ; ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_VEV ; ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_VEB ;
drivers/gpu/drm/i915/intel_ringbuffer.h +7 -4
@@ -115,16 +115,19 @@ struct intel_ring_buffer {struct {u32 sync_seqno[I915_NUM_RINGS -1 ]; -/* AKA wait() */ -int (*sync_to)(struct intel_ring_buffer *ring, -struct intel_ring_buffer *to, -u32 seqno); +struct {/* our mbox written by others */ u32 wait[I915_NUM_RINGS ];/* mboxes this ring signals to */ u32 signal[I915_NUM_RINGS ]; } mbox; + +/* AKA wait() */ +int (*sync_to)(struct intel_ring_buffer *ring, +struct intel_ring_buffer *to, +u32 seqno); +void (*signal)(struct intel_ring_buffer *signaller); } semaphore;/**
Signature · 6 lines
1.9.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/13 drm/i915: Move ring_begin to signal()
In reply to Ben WidawskyAdd_request has always contained both the semaphore mailbox updates as well as the breadcrumb writes. Since the semaphore signal is the one which actually knows about the number of dwords it needs to emit to the ring, we move the ring_begin to that function. This allows us to remove the hideously shared #define
On a related not, gen8 will use a different number of dwords for semaphores, but not for add request.
v2: Make number of dwords an explicit part of signalling (via function argument). (Chris)
v3: very slight comment change
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 39 +++++++++++++++++++-------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 4 +++- 2 files changed, 25 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +22 -17
@@ -634,18 +634,28 @@ static void render_ring_cleanup(struct intel_ring_buffer *ring) ring->scratch.obj =NULL ; } -static void gen6_signal (struct intel_ring_buffer *signaller) +static int gen6_signal (struct intel_ring_buffer *signaller, +unsigned int num_dwords) { -struct drm_i915_private *dev_priv = signaller->dev->dev_private; +struct drm_device *dev = signaller->dev; +struct drm_i915_private *dev_priv = dev->dev_private;struct intel_ring_buffer *useless; -int i; +int i, ret; -/* NB: In order to be able to do semaphore MBOX updates for varying number -* of rings, it's easiest if we round up each individual update to a -* multiple of 2 (since ring updates must always be a multiple of 2) -* even though the actual update only requires 3 dwords. -*/ +/* NB: In order to be able to do semaphore MBOX updates for varying +* number of rings, it's easiest if we round up each individual update +* to a multiple of 2 (since ring updates must always be a multiple of +* 2) even though the actual update only requires 3 dwords. +*/ #define MBOX_UPDATE_DWORDS 4 +if (i915_semaphore_is_enabled (dev)) + num_dwords += ((I915_NUM_RINGS -1 ) *MBOX_UPDATE_DWORDS ); + + ret =intel_ring_begin (signaller, num_dwords); +if (ret) +return ret; +#undef MBOX_UPDATE_DWORDS +for_each_ring (useless, dev_priv, i) {u32 mbox_reg = signaller->semaphore.mbox.signal[i];if (mbox_reg !=GEN6_NOSYNC ) {
@@ -660,6 +670,8 @@ static void gen6_signal(struct intel_ring_buffer *signaller)intel_ring_emit (signaller,MI_NOOP ); } } + +return 0 ; }/**
@@ -674,19 +686,12 @@ static void gen6_signal(struct intel_ring_buffer *signaller)static int gen6_add_request (struct intel_ring_buffer *ring) { -struct drm_device *dev = ring->dev; -int ret, num_dwords =4 ; - -if (i915_semaphore_is_enabled (dev)) - num_dwords += ((I915_NUM_RINGS -1 ) *MBOX_UPDATE_DWORDS ); -#undef MBOX_UPDATE_DWORDS +int ret; - ret =intel_ring_begin (ring, num_dwords); + ret = ring->semaphore.signal (ring,4 );if (ret)return ret; - ring->semaphore.signal (ring); -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, ring->outstanding_lazy_seqno);
drivers/gpu/drm/i915/intel_ringbuffer.h +3 -1
@@ -127,7 +127,9 @@ struct intel_ring_buffer {int (*sync_to)(struct intel_ring_buffer *ring,struct intel_ring_buffer *to,u32 seqno); -void (*signal)(struct intel_ring_buffer *signaller); +int (*signal)(struct intel_ring_buffer *signaller, +/* num_dwords needed by caller */ +unsigned int num_dwords); } semaphore;/**
Signature · 6 lines
1.9.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/13 drm/i915: Make semaphore updates more precise
In reply to Ben WidawskyWith the ring mask we now have an easy way to know the number of rings in the system, and therefore can accurately predict the number of dwords to emit for semaphore signalling. This was not possible (easily) previously.
There should be no functional impact, simply fewer instructions emitted.
While we're here, simply do the round up to 2 instead of the fancier rounding we did before, which rounding up per mbox, ie 4. This also allows us to drop the unnecessary MI_NOOP, so not really 4, 3.
v2: Use 3 dwords instead of 4 (Ville)
Do the proper calculation to get the number of dwords to emit (Ville) Conditionally set .sync_to when semaphores are enabled (Ville)
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 119 +++++++++++++++++--------------- 1 file changed, 62 insertions(+), 57 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +62 -57
@@ -637,24 +637,19 @@ static void render_ring_cleanup(struct intel_ring_buffer *ring)static int gen6_signal (struct intel_ring_buffer *signaller,unsigned int num_dwords) { +#define MBOX_UPDATE_DWORDS 3struct drm_device *dev = signaller->dev;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_ring_buffer *useless; -int i, ret; +int i, ret, num_rings; -/* NB: In order to be able to do semaphore MBOX updates for varying -* number of rings, it's easiest if we round up each individual update -* to a multiple of 2 (since ring updates must always be a multiple of -* 2) even though the actual update only requires 3 dwords. -*/ -#define MBOX_UPDATE_DWORDS 4 -if (i915_semaphore_is_enabled (dev)) - num_dwords += ((I915_NUM_RINGS -1 ) *MBOX_UPDATE_DWORDS ); + num_rings =hweight_long (INTEL_INFO (dev)->ring_mask); + num_dwords +=round_up ((num_rings-1 ) *MBOX_UPDATE_DWORDS ,2 ); +#undef MBOX_UPDATE_DWORDS ret =intel_ring_begin (signaller, num_dwords);if (ret)return ret; -#undef MBOX_UPDATE_DWORDSfor_each_ring (useless, dev_priv, i) {u32 mbox_reg = signaller->semaphore.mbox.signal[i];
@@ -662,15 +657,13 @@ static int gen6_signal(struct intel_ring_buffer *signaller,intel_ring_emit (signaller,MI_LOAD_REGISTER_IMM (1 ));intel_ring_emit (signaller, mbox_reg);intel_ring_emit (signaller, signaller->outstanding_lazy_seqno); -intel_ring_emit (signaller,MI_NOOP ); - }else { -intel_ring_emit (signaller,MI_NOOP ); -intel_ring_emit (signaller,MI_NOOP ); -intel_ring_emit (signaller,MI_NOOP ); -intel_ring_emit (signaller,MI_NOOP ); } } +/* If num_dwords was rounded, make sure the tail pointer is correct */ +if (num_rings %2 ==0 ) +intel_ring_emit (signaller,MI_NOOP ); +return 0 ; }
@@ -688,7 +681,11 @@ gen6_add_request(struct intel_ring_buffer *ring) {int ret; - ret = ring->semaphore.signal (ring,4 ); +if (ring->semaphore.signal) + ret = ring->semaphore.signal (ring,4 ); +else + ret =intel_ring_begin (ring,4 ); +if (ret)return ret;
@@ -1889,16 +1886,18 @@ int intel_init_render_ring_buffer(struct drm_device *dev) ring->irq_enable_mask =GT_RENDER_USER_INTERRUPT ; ring->get_seqno = gen6_ring_get_seqno; ring->set_seqno = ring_set_seqno; - ring->semaphore.sync_to = gen6_ring_sync; - ring->semaphore.signal = gen6_signal; - ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_INVALID ; - ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_RV ; - ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_RB ; - ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_RVE ; - ring->semaphore.mbox.signal[RCS ] =GEN6_NOSYNC ; - ring->semaphore.mbox.signal[VCS ] =GEN6_VRSYNC ; - ring->semaphore.mbox.signal[BCS ] =GEN6_BRSYNC ; - ring->semaphore.mbox.signal[VECS ] =GEN6_VERSYNC ; +if (i915_semaphore_is_enabled (dev)) { + ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; + ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_RV ; + ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_RB ; + ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_RVE ; + ring->semaphore.mbox.signal[RCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VCS ] =GEN6_VRSYNC ; + ring->semaphore.mbox.signal[BCS ] =GEN6_BRSYNC ; + ring->semaphore.mbox.signal[VECS ] =GEN6_VERSYNC ; + } }else if (IS_GEN5 (dev)) { ring->add_request = pc_render_add_request; ring->flush = gen4_render_ring_flush;
@@ -2066,16 +2065,18 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer; } - ring->semaphore.sync_to = gen6_ring_sync; - ring->semaphore.signal = gen6_signal; - ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_VR ; - ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_INVALID ; - ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_VB ; - ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_VVE ; - ring->semaphore.mbox.signal[RCS ] =GEN6_RVSYNC ; - ring->semaphore.mbox.signal[VCS ] =GEN6_NOSYNC ; - ring->semaphore.mbox.signal[BCS ] =GEN6_BVSYNC ; - ring->semaphore.mbox.signal[VECS ] =GEN6_VEVSYNC ; +if (i915_semaphore_is_enabled (dev)) { + ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; + ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_VR ; + ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_VB ; + ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_VVE ; + ring->semaphore.mbox.signal[RCS ] =GEN6_RVSYNC ; + ring->semaphore.mbox.signal[VCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[BCS ] =GEN6_BVSYNC ; + ring->semaphore.mbox.signal[VECS ] =GEN6_VEVSYNC ; + } }else { ring->mmio_base =BSD_RING_BASE ; ring->flush = bsd_ring_flush;
@@ -2124,16 +2125,18 @@ 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->semaphore.sync_to = gen6_ring_sync; - ring->semaphore.signal = gen6_signal; - ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_BR ; - ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_BV ; - ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_INVALID ; - ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_BVE ; - ring->semaphore.mbox.signal[RCS ] =GEN6_RBSYNC ; - ring->semaphore.mbox.signal[VCS ] =GEN6_VBSYNC ; - ring->semaphore.mbox.signal[BCS ] =GEN6_NOSYNC ; - ring->semaphore.mbox.signal[VECS ] =GEN6_VEBSYNC ; +if (i915_semaphore_is_enabled (dev)) { + ring->semaphore.signal = gen6_signal; + ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_BR ; + ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_BV ; + ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_BVE ; + ring->semaphore.mbox.signal[RCS ] =GEN6_RBSYNC ; + ring->semaphore.mbox.signal[VCS ] =GEN6_VBSYNC ; + ring->semaphore.mbox.signal[BCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VECS ] =GEN6_VEBSYNC ; + } ring->init = init_ring_common;return intel_init_ring_buffer (dev, ring);
@@ -2166,16 +2169,18 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev) ring->irq_put = hsw_vebox_put_irq; ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer; } - ring->semaphore.sync_to = gen6_ring_sync; - ring->semaphore.signal = gen6_signal; - ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_VER ; - ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_VEV ; - ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_VEB ; - ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_INVALID ; - ring->semaphore.mbox.signal[RCS ] =GEN6_RVESYNC ; - ring->semaphore.mbox.signal[VCS ] =GEN6_VVESYNC ; - ring->semaphore.mbox.signal[BCS ] =GEN6_BVESYNC ; - ring->semaphore.mbox.signal[VECS ] =GEN6_NOSYNC ; +if (i915_semaphore_is_enabled (dev)) { + ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; + ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_VER ; + ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_VEV ; + ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_VEB ; + ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.signal[RCS ] =GEN6_RVESYNC ; + ring->semaphore.mbox.signal[VCS ] =GEN6_VVESYNC ; + ring->semaphore.mbox.signal[BCS ] =GEN6_BVESYNC ; + ring->semaphore.mbox.signal[VECS ] =GEN6_NOSYNC ; + } ring->init = init_ring_common;return intel_init_ring_buffer (dev, ring);
Signature · 6 lines
1.9.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 04/13] drm/i915: Make semaphore updates more precise
Quoted 35 lines · Ben Widawsky
With the ring mask we now have an easy way to know the number of rings in the system, and therefore can accurately predict the number of dwords to emit for semaphore signalling. This was not possible (easily) previously.
There should be no functional impact, simply fewer instructions emitted.
While we're here, simply do the round up to 2 instead of the fancier rounding we did before, which rounding up per mbox, ie 4. This also allows us to drop the unnecessary
MI_NOOP, so not really 4, 3.v2: Use 3 dwords instead of 4 (Ville)
Do the proper calculation to get the number of dwords to emit (Ville) Conditionally set .sync_to when semaphores are enabled (Ville)Reviewed-by Ville Syrjälä <[email protected]>Signed-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/intel_ringbuffer.c | 119 +++++++++++++++++--------------- 1 file changed, 62 insertions(+), 57 deletions(-)drivers/gpu/drm/i915/intel_ringbuffer.c +2
-1@@ -637,24 +637,19 @@ static void render_ring_cleanup(struct intel_ring_buffer *ring)static int gen6_signal (struct intel_ring_buffer *signaller,unsigned int num_dwords) { +#define MBOX_UPDATE_DWORDS 3struct drm_device *dev = signaller->dev;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_ring_buffer *useless; -int i, ret; +int i, ret, num_rings;
drivers/gpu/drm/i915/intel_ringbuffer.c static void render_ring_cleanup(struct intel_ring_buffer *ring) · line 646
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +1
-8-/* NB: In order to be able to do semaphore MBOX updates for varying -* number of rings, it's easiest if we round up each individual update -* to a multiple of 2 (since ring updates must always be a multiple of -* 2) even though the actual update only requires 3 dwords. -*/ -#define MBOX_UPDATE_DWORDS 4 -if (i915_semaphore_is_enabled (dev)) - num_dwords += ((I915_NUM_RINGS -1 ) *MBOX_UPDATE_DWORDS ); + num_rings =hweight_long (INTEL_INFO (dev)->ring_mask);
hweight32() would be enough.
<snip>
Signature · 2 lines
Ville Syrjälä Intel OTC
PATCH 5/13 drm/i915: gen specific ring init
In reply to Ben WidawskyGen8 has already had some differentiation with how it handles rings. Semaphores bring yet more differences, and now is as good a time as any to do the split.
Also, since gen8 doesn't actually use semaphores up until this point, put the proper "NULL" values in for the mbox info.
v2: v1 had a stale commit message
v3: Move everything in the is_semaphore_enabled() check
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 142 ++++++++++++++++++++++---------- 1 file changed, 97 insertions(+), 45 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +97 -45
@@ -1870,19 +1870,34 @@ int intel_init_render_ring_buffer(struct drm_device *dev) ring->id =RCS ; ring->mmio_base =RENDER_RING_BASE ; -if (INTEL_INFO (dev)->gen >=6 ) { +if (INTEL_INFO (dev)->gen >=8 ) { + ring->add_request = gen6_add_request; + ring->flush = gen8_render_ring_flush; + ring->irq_get = gen8_ring_get_irq; + ring->irq_put = gen8_ring_put_irq; + ring->irq_enable_mask =GT_RENDER_USER_INTERRUPT ; + ring->get_seqno = gen6_ring_get_seqno; + ring->set_seqno = ring_set_seqno; +if (i915_semaphore_is_enabled (dev)) { + ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; + ring->semaphore.signal = gen6_signal; + ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.signal[RCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[BCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VECS ] =GEN6_NOSYNC ; + } + }else if (INTEL_INFO (dev)->gen >=6 ) { ring->add_request = gen6_add_request; ring->flush = gen7_render_ring_flush;if (INTEL_INFO (dev)->gen ==6 ) ring->flush = gen6_render_ring_flush; -if (INTEL_INFO (dev)->gen >=8 ) { - ring->flush = gen8_render_ring_flush; - ring->irq_get = gen8_ring_get_irq; - ring->irq_put = gen8_ring_put_irq; - }else { - ring->irq_get = gen6_ring_get_irq; - ring->irq_put = gen6_ring_put_irq; - } + ring->irq_get = gen6_ring_get_irq; + ring->irq_put = gen6_ring_put_irq; ring->irq_enable_mask =GT_RENDER_USER_INTERRUPT ; ring->get_seqno = gen6_ring_get_seqno; ring->set_seqno = ring_set_seqno;
@@ -1925,6 +1940,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev) ring->irq_enable_mask =I915_USER_INTERRUPT ; } ring->write_tail = ring_write_tail; +if (IS_HASWELL (dev)) ring->dispatch_execbuffer = hsw_ring_dispatch_execbuffer;else if (IS_GEN8 (dev))
@@ -2058,24 +2074,36 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) ring->irq_put = gen8_ring_put_irq; ring->dispatch_execbuffer = gen8_ring_dispatch_execbuffer; +if (i915_semaphore_is_enabled (dev)) { + ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; + ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.signal[RCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[BCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VECS ] =GEN6_NOSYNC ; + } }else { ring->irq_enable_mask =GT_BSD_USER_INTERRUPT ; ring->irq_get = gen6_ring_get_irq; ring->irq_put = gen6_ring_put_irq; ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer; - } -if (i915_semaphore_is_enabled (dev)) { - ring->semaphore.sync_to = gen6_ring_sync; - ring->semaphore.signal = gen6_signal; - ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_VR ; - ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_INVALID ; - ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_VB ; - ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_VVE ; - ring->semaphore.mbox.signal[RCS ] =GEN6_RVSYNC ; - ring->semaphore.mbox.signal[VCS ] =GEN6_NOSYNC ; - ring->semaphore.mbox.signal[BCS ] =GEN6_BVSYNC ; - ring->semaphore.mbox.signal[VECS ] =GEN6_VEVSYNC ; +if (i915_semaphore_is_enabled (dev)) { + ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; + ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_VR ; + ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_VB ; + ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_VVE ; + ring->semaphore.mbox.signal[RCS ] =GEN6_RVSYNC ; + ring->semaphore.mbox.signal[VCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[BCS ] =GEN6_BVSYNC ; + ring->semaphore.mbox.signal[VECS ] =GEN6_VEVSYNC ; + } } }else { ring->mmio_base =BSD_RING_BASE ;
@@ -2119,23 +2147,35 @@ int intel_init_blt_ring_buffer(struct drm_device *dev) ring->irq_get = gen8_ring_get_irq; ring->irq_put = gen8_ring_put_irq; ring->dispatch_execbuffer = gen8_ring_dispatch_execbuffer; +if (i915_semaphore_is_enabled (dev)) { + ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; + ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.signal[RCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[BCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VECS ] =GEN6_NOSYNC ; + } }else { ring->irq_enable_mask =GT_BLT_USER_INTERRUPT ; ring->irq_get = gen6_ring_get_irq; ring->irq_put = gen6_ring_put_irq; ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer; - } -if (i915_semaphore_is_enabled (dev)) { - ring->semaphore.signal = gen6_signal; - ring->semaphore.sync_to = gen6_ring_sync; - ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_BR ; - ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_BV ; - ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_INVALID ; - ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_BVE ; - ring->semaphore.mbox.signal[RCS ] =GEN6_RBSYNC ; - ring->semaphore.mbox.signal[VCS ] =GEN6_VBSYNC ; - ring->semaphore.mbox.signal[BCS ] =GEN6_NOSYNC ; - ring->semaphore.mbox.signal[VECS ] =GEN6_VEBSYNC ; +if (i915_semaphore_is_enabled (dev)) { + ring->semaphore.signal = gen6_signal; + ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_BR ; + ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_BV ; + ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_BVE ; + ring->semaphore.mbox.signal[RCS ] =GEN6_RBSYNC ; + ring->semaphore.mbox.signal[VCS ] =GEN6_VBSYNC ; + ring->semaphore.mbox.signal[BCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VECS ] =GEN6_VEBSYNC ; + } } ring->init = init_ring_common;
@@ -2163,23 +2203,35 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev) ring->irq_get = gen8_ring_get_irq; ring->irq_put = gen8_ring_put_irq; ring->dispatch_execbuffer = gen8_ring_dispatch_execbuffer; +if (i915_semaphore_is_enabled (dev)) { + ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; + ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.signal[RCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[BCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VECS ] =GEN6_NOSYNC ; + } }else { ring->irq_enable_mask =PM_VEBOX_USER_INTERRUPT ; ring->irq_get = hsw_vebox_get_irq; ring->irq_put = hsw_vebox_put_irq; ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer; - } -if (i915_semaphore_is_enabled (dev)) { - ring->semaphore.sync_to = gen6_ring_sync; - ring->semaphore.signal = gen6_signal; - ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_VER ; - ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_VEV ; - ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_VEB ; - ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_INVALID ; - ring->semaphore.mbox.signal[RCS ] =GEN6_RVESYNC ; - ring->semaphore.mbox.signal[VCS ] =GEN6_VVESYNC ; - ring->semaphore.mbox.signal[BCS ] =GEN6_BVESYNC ; - ring->semaphore.mbox.signal[VECS ] =GEN6_NOSYNC ; +if (i915_semaphore_is_enabled (dev)) { + ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; + ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_VER ; + ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_VEV ; + ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_VEB ; + ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.signal[RCS ] =GEN6_RVESYNC ; + ring->semaphore.mbox.signal[VCS ] =GEN6_VVESYNC ; + ring->semaphore.mbox.signal[BCS ] =GEN6_BVESYNC ; + ring->semaphore.mbox.signal[VECS ] =GEN6_NOSYNC ; + } } ring->init = init_ring_common;
Signature · 1 line
1.9.0
Re: [PATCH 05/13] drm/i915: gen specific ring init
Quoted 27 lines · Ben Widawsky
Gen8 has already had some differentiation with how it handles rings. Semaphores bring yet more differences, and now is as good a time as any to do the split.
Also, since gen8 doesn't actually use semaphores up until this point, put the proper "NULL" values in for the mbox info.
v2: v1 had a stale commit message
v3: Move everything in the
is_semaphore_enabled()checkSigned-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/intel_ringbuffer.c | 142 ++++++++++++++++++++++---------- 1 file changed, 97 insertions(+), 45 deletions(-)drivers/gpu/drm/i915/intel_ringbuffer.c +2
-1@@ -1870,19 +1870,34 @@ int intel_init_render_ring_buffer(struct drm_device *dev) ring->id =RCS ; ring->mmio_base =RENDER_RING_BASE ; -if (INTEL_INFO (dev)->gen >=6 ) { +if (INTEL_INFO (dev)->gen >=8 ) { + ring->add_request = gen6_add_request;
drivers/gpu/drm/i915/intel_ringbuffer.c int intel_init_render_ring_buffer(struct drm_device *dev) · line 1884
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +10
-0+ ring->flush = gen8_render_ring_flush; + ring->irq_get = gen8_ring_get_irq; + ring->irq_put = gen8_ring_put_irq; + ring->irq_enable_mask =GT_RENDER_USER_INTERRUPT ; + ring->get_seqno = gen6_ring_get_seqno; + ring->set_seqno = ring_set_seqno; +if (i915_semaphore_is_enabled (dev)) { + ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; + ring->semaphore.signal = gen6_signal;
Double assignment.
Quoted 182 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +85
-44+ ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.signal[RCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[BCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VECS ] =GEN6_NOSYNC ; + } + }else if (INTEL_INFO (dev)->gen >=6 ) { ring->add_request = gen6_add_request; ring->flush = gen7_render_ring_flush;if (INTEL_INFO (dev)->gen ==6 ) ring->flush = gen6_render_ring_flush; -if (INTEL_INFO (dev)->gen >=8 ) { - ring->flush = gen8_render_ring_flush; - ring->irq_get = gen8_ring_get_irq; - ring->irq_put = gen8_ring_put_irq; - }else { - ring->irq_get = gen6_ring_get_irq; - ring->irq_put = gen6_ring_put_irq; - } + ring->irq_get = gen6_ring_get_irq; + ring->irq_put = gen6_ring_put_irq; ring->irq_enable_mask =GT_RENDER_USER_INTERRUPT ; ring->get_seqno = gen6_ring_get_seqno; ring->set_seqno = ring_set_seqno;@@ -1925,6 +1940,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev) ring->irq_enable_mask =I915_USER_INTERRUPT ; } ring->write_tail = ring_write_tail; +if (IS_HASWELL (dev)) ring->dispatch_execbuffer = hsw_ring_dispatch_execbuffer;else if (IS_GEN8 (dev))@@ -2058,24 +2074,36 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) ring->irq_put = gen8_ring_put_irq; ring->dispatch_execbuffer = gen8_ring_dispatch_execbuffer; +if (i915_semaphore_is_enabled (dev)) { + ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; + ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.signal[RCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[BCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VECS ] =GEN6_NOSYNC ; + } }else { ring->irq_enable_mask =GT_BSD_USER_INTERRUPT ; ring->irq_get = gen6_ring_get_irq; ring->irq_put = gen6_ring_put_irq; ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer; - } -if (i915_semaphore_is_enabled (dev)) { - ring->semaphore.sync_to = gen6_ring_sync; - ring->semaphore.signal = gen6_signal; - ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_VR ; - ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_INVALID ; - ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_VB ; - ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_VVE ; - ring->semaphore.mbox.signal[RCS ] =GEN6_RVSYNC ; - ring->semaphore.mbox.signal[VCS ] =GEN6_NOSYNC ; - ring->semaphore.mbox.signal[BCS ] =GEN6_BVSYNC ; - ring->semaphore.mbox.signal[VECS ] =GEN6_VEVSYNC ; +if (i915_semaphore_is_enabled (dev)) { + ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; + ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_VR ; + ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_VB ; + ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_VVE ; + ring->semaphore.mbox.signal[RCS ] =GEN6_RVSYNC ; + ring->semaphore.mbox.signal[VCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[BCS ] =GEN6_BVSYNC ; + ring->semaphore.mbox.signal[VECS ] =GEN6_VEVSYNC ; + } } }else { ring->mmio_base =BSD_RING_BASE ;@@ -2119,23 +2147,35 @@ int intel_init_blt_ring_buffer(struct drm_device *dev) ring->irq_get = gen8_ring_get_irq; ring->irq_put = gen8_ring_put_irq; ring->dispatch_execbuffer = gen8_ring_dispatch_execbuffer; +if (i915_semaphore_is_enabled (dev)) { + ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; + ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.signal[RCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[BCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VECS ] =GEN6_NOSYNC ; + } }else { ring->irq_enable_mask =GT_BLT_USER_INTERRUPT ; ring->irq_get = gen6_ring_get_irq; ring->irq_put = gen6_ring_put_irq; ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer; - } -if (i915_semaphore_is_enabled (dev)) { - ring->semaphore.signal = gen6_signal; - ring->semaphore.sync_to = gen6_ring_sync; - ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_BR ; - ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_BV ; - ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_INVALID ; - ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_BVE ; - ring->semaphore.mbox.signal[RCS ] =GEN6_RBSYNC ; - ring->semaphore.mbox.signal[VCS ] =GEN6_VBSYNC ; - ring->semaphore.mbox.signal[BCS ] =GEN6_NOSYNC ; - ring->semaphore.mbox.signal[VECS ] =GEN6_VEBSYNC ; +if (i915_semaphore_is_enabled (dev)) { + ring->semaphore.signal = gen6_signal; + ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_BR ; + ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_BV ; + ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_BVE ; + ring->semaphore.mbox.signal[RCS ] =GEN6_RBSYNC ; + ring->semaphore.mbox.signal[VCS ] =GEN6_VBSYNC ; + ring->semaphore.mbox.signal[BCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VECS ] =GEN6_VEBSYNC ; + } } ring->init = init_ring_common;@@ -2163,23 +2203,35 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev) ring->irq_get = gen8_ring_get_irq; ring->irq_put = gen8_ring_put_irq; ring->dispatch_execbuffer = gen8_ring_dispatch_execbuffer; +if (i915_semaphore_is_enabled (dev)) { + ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; + ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.signal[RCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[BCS ] =GEN6_NOSYNC ; + ring->semaphore.mbox.signal[VECS ] =GEN6_NOSYNC ; + } }else { ring->irq_enable_mask =PM_VEBOX_USER_INTERRUPT ; ring->irq_get = hsw_vebox_get_irq; ring->irq_put = hsw_vebox_put_irq; ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer; - } -if (i915_semaphore_is_enabled (dev)) { - ring->semaphore.sync_to = gen6_ring_sync; - ring->semaphore.signal = gen6_signal; - ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_VER ; - ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_VEV ; - ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_VEB ; - ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_INVALID ; - ring->semaphore.mbox.signal[RCS ] =GEN6_RVESYNC ; - ring->semaphore.mbox.signal[VCS ] =GEN6_VVESYNC ; - ring->semaphore.mbox.signal[BCS ] =GEN6_BVESYNC ; - ring->semaphore.mbox.signal[VECS ] =GEN6_NOSYNC ; +if (i915_semaphore_is_enabled (dev)) { + ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.signal = gen6_signal; + ring->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_VER ; + ring->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_VEV ; + ring->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_VEB ; + ring->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_INVALID ; + ring->semaphore.mbox.signal[RCS ] =GEN6_RVESYNC ; + ring->semaphore.mbox.signal[VCS ] =GEN6_VVESYNC ; + ring->semaphore.mbox.signal[BCS ] =GEN6_BVESYNC ; + ring->semaphore.mbox.signal[VECS ] =GEN6_NOSYNC ; + } } ring->init = init_ring_common;Signature · 1 line
1.9.0
Signature · 2 lines
Ville Syrjälä Intel OTC
PATCH 6/13 drm/i915/bdw: implement semaphore signal
In reply to Ben WidawskySemaphore signalling works similarly to previous GENs with the exception that the per ring mailboxes no longer exist. Instead you must define your own space, somewhere in the GTT.
The comments in the code define the layout I've opted for, which should be fairly future proof. Ie. I tried to define offsets in abstract terms (NUM_RINGS, seqno size, etc).
NOTE: If one wanted to move this to the HWSP they could. I've decided one 4k object would be easier to deal with, and provide potential wins with cache locality, but that's all speculative.
v2: Update the macro to not need the other ring's ring->id (Chris) Update the comment to use the correct formula (Chris)
v3: Move the macros the ringbuffer.h to prevent churn in next patch (Ville)
v4: Fixed compilation rebase conflict
commit 1ec9e26ddab06459e89a890431b2de064c5d1056
Author: Daniel Vetter <[email protected]> Date: Fri Feb 14 14:01:11 2014 +0100
drm/i915: Consolidate binding parameters into flags
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 5 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 153 +++++++++++++++++++++++--------- drivers/gpu/drm/i915/intel_ringbuffer.h | 73 +++++++++++++-- 4 files changed, 185 insertions(+), 47 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -1419,6 +1419,7 @@ typedef struct drm_i915_private {struct pci_dev *bridge_dev;struct intel_ring_buffer ring[I915_NUM_RINGS ]; +struct drm_i915_gem_object *semaphore_obj;uint32_t last_seqno, next_seqno;drm_dma_handle_t *status_page_dmah;
drivers/gpu/drm/i915/i915_reg.h +4 -1
@@ -215,7 +215,7 @@#define MI_DISPLAY_FLIP_IVB_SPRITE_B (3 << 19)#define MI_DISPLAY_FLIP_IVB_PLANE_C (4 << 19)#define MI_DISPLAY_FLIP_IVB_SPRITE_C (5 << 19) -#define MI_SEMAPHORE_MBOX MI_INSTR(0x16, 1)/* gen6+ */ +#define MI_SEMAPHORE_MBOX MI_INSTR(0x16, 1)/* gen6, gen7 */ #define MI_SEMAPHORE_GLOBAL_GTT (1<<22)#define MI_SEMAPHORE_UPDATE (1<<21)#define MI_SEMAPHORE_COMPARE (1<<20)
@@ -240,6 +240,8 @@#define MI_RESTORE_EXT_STATE_EN (1<<2)#define MI_FORCE_RESTORE (1<<1)#define MI_RESTORE_INHIBIT (1<<0) +#define MI_SEMAPHORE_SIGNAL MI_INSTR(0x1b, 0)/* GEN8+ */ +#define MI_SEMAPHORE_TARGET (engine) ((engine)<<15)#define MI_STORE_DWORD_IMM MI_INSTR(0x20, 1)#define MI_MEM_VIRTUAL (1 << 22)/* 965+ only */ #define MI_STORE_DWORD_INDEX MI_INSTR(0x21, 1)
@@ -328,6 +330,7 @@#define PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE (1<<10)/* GM45+ only */ #define PIPE_CONTROL_INDIRECT_STATE_DISABLE (1<<9)#define PIPE_CONTROL_NOTIFY (1<<8) +#define PIPE_CONTROL_FLUSH_ENABLE (1<<7)/* gen7+ */ #define PIPE_CONTROL_VF_CACHE_INVALIDATE (1<<4)#define PIPE_CONTROL_CONST_CACHE_INVALIDATE (1<<3)#define PIPE_CONTROL_STATE_CACHE_INVALIDATE (1<<2)
drivers/gpu/drm/i915/intel_ringbuffer.c +113 -40
208 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +67 -6
88 lines not on this page · raw message
Signature · 1 line
1.9.0
Re: [PATCH 06/13] drm/i915/bdw: implement semaphore signal
On Wed, Feb 19, 2014 at 10:19:19PM -0800, Ben Widawsky wrote:
<snip>
Quoted 4 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0@@ -634,6 +641,85 @@ static void render_ring_cleanup(struct intel_ring_buffer *ring) ring->scratch.obj =NULL ; }
drivers/gpu/drm/i915/intel_ringbuffer.c static void render_ring_cleanup(struct intel_ring_buffer *ring) · line 653
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +10
-0+static int gen8_rcs_signal (struct intel_ring_buffer *signaller, +unsigned int num_dwords) +{ +#define MBOX_UPDATE_DWORDS 8 +struct drm_device *dev = signaller->dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_ring_buffer *waiter; +int i, ret, num_rings; + + num_rings =hweight_long (INTEL_INFO (dev)->ring_mask);
Again hweight32() would be enough.
<snip>
Signature · 2 lines
Ville Syrjälä Intel OTC
Re: [PATCH 06/13] drm/i915/bdw: implement semaphore signal
Quoted 6 lines · Ville Syrjälä
On Wed, Feb 19, 2014 at 10:19:19PM -0800, Ben Widawsky wrote:
<snip>Quoted 4 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0@@ -634,6 +641,85 @@ static void render_ring_cleanup(struct intel_ring_buffer *ring) ring->scratch.obj =NULL ; }
Quoted 12 lines
drivers/gpu/drm/i915/intel_ringbuffer.c static void render_ring_cleanup(struct intel_ring_buffer *ring) · line 653
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +10
-0+static int gen8_rcs_signal (struct intel_ring_buffer *signaller, +unsigned int num_dwords) +{ +#define MBOX_UPDATE_DWORDS 8 +struct drm_device *dev = signaller->dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_ring_buffer *waiter; +int i, ret, num_rings; + + num_rings =hweight_long (INTEL_INFO (dev)->ring_mask);Again
hweight32()would be enough.
And I noticed there's even a hweight8() if we want to micro optimize, but I don't really care that much, so even leaving these as hweight_long() is fine by me.
Signature · 2 lines
Ville Syrjälä Intel OTC
PATCH 7/13 drm/i915/bdw: implement semaphore wait
In reply to Ben WidawskySemaphore waits use a new instruction, MI_SEMAPHORE_WAIT. The seqno to wait on is all well defined by the table in the previous patch. There is nothing else different from previous GEN's semaphore synchronization code.
v2: Update macros to not require the other ring's ring->id (Chris)
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_ringbuffer.c | 33 +++++++++++++++++++++++++++++---- drivers/gpu/drm/i915/intel_ringbuffer.h | 4 ++-- 3 files changed, 34 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -242,6 +242,9 @@#define MI_RESTORE_INHIBIT (1<<0)#define MI_SEMAPHORE_SIGNAL MI_INSTR(0x1b, 0)/* GEN8+ */ #define MI_SEMAPHORE_TARGET (engine) ((engine)<<15) +#define MI_SEMAPHORE_WAIT MI_INSTR(0x1c, 2)/* GEN8+ */ +#define MI_SEMAPHORE_POLL (1<<15) +#define MI_SEMAPHORE_SAD_GTE_SDD (1<<12)#define MI_STORE_DWORD_IMM MI_INSTR(0x20, 1)#define MI_MEM_VIRTUAL (1 << 22)/* 965+ only */ #define MI_STORE_DWORD_INDEX MI_INSTR(0x21, 1)
drivers/gpu/drm/i915/intel_ringbuffer.c +29 -4
@@ -798,6 +798,31 @@ static inline bool i915_gem_has_seqno_wrapped(struct drm_device *dev,* @signaller - ring which has, or will signal * @seqno - seqno which the waiter will block on */ + +static int +gen8_ring_sync (struct intel_ring_buffer *waiter, +struct intel_ring_buffer *signaller, +u32 seqno) +{ +struct drm_i915_private *dev_priv = waiter->dev->dev_private; +int ret; + + ret =intel_ring_begin (waiter,4 ); +if (ret) +return ret; + +intel_ring_emit (waiter,MI_SEMAPHORE_WAIT | +MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_SAD_GTE_SDD ); +intel_ring_emit (waiter, seqno); +intel_ring_emit (waiter, +lower_32_bits (GEN8_WAIT_OFFSET (waiter, signaller->id))); +intel_ring_emit (waiter, +upper_32_bits (GEN8_WAIT_OFFSET (waiter, signaller->id))); +intel_ring_advance (waiter); +return 0 ; +} + static int gen6_ring_sync(struct intel_ring_buffer *waiter, struct intel_ring_buffer *signaller,
@@ -1984,7 +2009,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev) ring->set_seqno = ring_set_seqno;if (i915_semaphore_is_enabled (dev)) {BUG_ON (!dev_priv->semaphore_obj); - ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.sync_to = gen8_ring_sync; ring->semaphore.signal = gen8_rcs_signal;GEN8_RING_SEMAPHORE_INIT ; }
@@ -2169,7 +2194,7 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) ring->dispatch_execbuffer = gen8_ring_dispatch_execbuffer;if (i915_semaphore_is_enabled (dev)) { - ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.sync_to = gen8_ring_sync; ring->semaphore.signal = gen8_xcs_signal;GEN8_RING_SEMAPHORE_INIT ; }
@@ -2235,7 +2260,7 @@ int intel_init_blt_ring_buffer(struct drm_device *dev) ring->irq_put = gen8_ring_put_irq; ring->dispatch_execbuffer = gen8_ring_dispatch_execbuffer;if (i915_semaphore_is_enabled (dev)) { - ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.sync_to = gen8_ring_sync; ring->semaphore.signal = gen8_xcs_signal;GEN8_RING_SEMAPHORE_INIT ; }
@@ -2284,7 +2309,7 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev) ring->irq_put = gen8_ring_put_irq; ring->dispatch_execbuffer = gen8_ring_dispatch_execbuffer;if (i915_semaphore_is_enabled (dev)) { - ring->semaphore.sync_to = gen6_ring_sync; + ring->semaphore.sync_to = gen8_ring_sync; ring->semaphore.signal = gen8_xcs_signal;GEN8_RING_SEMAPHORE_INIT ; }
drivers/gpu/drm/i915/intel_ringbuffer.h +2 -2
@@ -42,10 +42,10 @@ struct intel_hw_status_page { (ring->id *I915_NUM_RINGS * i915_semaphore_seqno_size) + \ (i915_semaphore_seqno_size * (to))) -#define GEN8_WAIT_OFFSET(from) \ +#define GEN8_WAIT_OFFSET(__ring, from) \ (i915_gem_obj_ggtt_offset (dev_priv->semaphore_obj) + \ ((from) *I915_NUM_RINGS * i915_semaphore_seqno_size) + \ - (i915_semaphore_seqno_size * ring->id)) + (i915_semaphore_seqno_size * (__ring)->id))#define GEN8_RING_SEMAPHORE_INIT do { \ if (!dev_priv->semaphore_obj) { \
Signature · 1 line
1.9.0
PATCH 8/13 drm/i915/bdw: poll semaphores
In reply to Ben Widawsky--- drivers/gpu/drm/i915/intel_ringbuffer.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -0
@@ -813,6 +813,7 @@ gen8_ring_sync(struct intel_ring_buffer *waiter,intel_ring_emit (waiter,MI_SEMAPHORE_WAIT |MI_SEMAPHORE_GLOBAL_GTT | +MI_SEMAPHORE_POLL |MI_SEMAPHORE_SAD_GTE_SDD );intel_ring_emit (waiter, seqno); intel_ring_emit(waiter,
Signature · 1 line
1.9.0
Re: [PATCH 08/13] drm/i915/bdw: poll semaphores
Quoted 10 lines · Ben Widawsky
Signed-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/intel_ringbuffer.c | 1 + 1 file changed, 1 insertion(+)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0
drivers/gpu/drm/i915/intel_ringbuffer.c gen8_ring_sync(struct intel_ring_buffer *waiter, · line 816
Quoted 4 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +1
-0@@ -813,6 +813,7 @@ gen8_ring_sync(struct intel_ring_buffer *waiter, intel_ring_emit(waiter, MI_SEMAPHORE_WAIT | MI_SEMAPHORE_GLOBAL_GTT | + MI_SEMAPHORE_POLL |
I discussed this on irc w/ Ben, and I was suggesting we don't need to poll. Polling apparently can be used as a workaround for certain hardware issues, but it looks like those issues shouldn't affect us, for the momemnt at least. So my suggestion was to try w/o polling first (since there could be some power cost to polling) and add the poll bit if problems arise.
Quoted 5 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0MI_SEMAPHORE_SAD_GTE_SDD);intel_ring_emit (waiter, seqno); intel_ring_emit(waiter,Signature · 1 line
1.9.0
Signature · 2 lines
Ville Syrjälä Intel OTC
PATCH 9/13 drm/i915: Extract semaphore error collection
In reply to Ben Widawsky--- drivers/gpu/drm/i915/i915_gpu_error.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/i915_gpu_error.c +17 -12
@@ -797,6 +797,22 @@ i915_error_first_batchbuffer(struct drm_i915_private *dev_priv,return NULL ; } +static void gen6_record_semaphore_state (struct drm_i915_private *dev_priv, +struct intel_ring_buffer *ring, +struct drm_i915_error_ring *ering) +{ + ering->semaphore_mboxes[0 ] =I915_READ (RING_SYNC_0 (ring->mmio_base)); + ering->semaphore_mboxes[1 ] =I915_READ (RING_SYNC_1 (ring->mmio_base)); + ering->semaphore_seqno[0 ] = ring->semaphore.sync_seqno[0 ]; + ering->semaphore_seqno[1 ] = ring->semaphore.sync_seqno[1 ]; + +if (HAS_VEBOX (dev_priv->dev)) { + ering->semaphore_mboxes[2 ] = +I915_READ (RING_SYNC_2 (ring->mmio_base)); + ering->semaphore_seqno[2 ] = ring->semaphore.sync_seqno[2 ]; + } +} +static void i915_record_ring_state (struct drm_device *dev,struct intel_ring_buffer *ring,struct drm_i915_error_ring *ering)
@@ -806,18 +822,7 @@ static void i915_record_ring_state(struct drm_device *dev,if (INTEL_INFO (dev)->gen >=6 ) { ering->rc_psmi =I915_READ (ring->mmio_base +0x50 ); ering->fault_reg =I915_READ (RING_FAULT_REG (ring)); - ering->semaphore_mboxes[0 ] - =I915_READ (RING_SYNC_0 (ring->mmio_base)); - ering->semaphore_mboxes[1 ] - =I915_READ (RING_SYNC_1 (ring->mmio_base)); - ering->semaphore_seqno[0 ] = ring->semaphore.sync_seqno[0 ]; - ering->semaphore_seqno[1 ] = ring->semaphore.sync_seqno[1 ]; - } - -if (HAS_VEBOX (dev)) { - ering->semaphore_mboxes[2 ] = -I915_READ (RING_SYNC_2 (ring->mmio_base)); - ering->semaphore_seqno[2 ] = ring->semaphore.sync_seqno[2 ]; +gen6_record_semaphore_state (dev_priv, ring, ering); }if (INTEL_INFO (dev)->gen >=4 ) {
Signature · 1 line
1.9.0
PATCH 10/13 drm/i915/bdw: collect semaphore error state
In reply to Ben WidawskySince the semaphore information is in an object, just dump it, and let the user parse it later.
NOTE: The page being used for the semaphores are incoherent with the CPU. No matter what I do, I cannot figure out a way to read anything but 0s. Note that the semaphore waits are indeed working.
v2: Don't print signal, and wait (they should be the same). Instead, print sync_seqno (Chris)
v3: Free the semaphore error object (Chris)
v4: Fix semaphore offset calculation during error state collection (Ville)
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gpu_error.c | 52 ++++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_ringbuffer.h | 12 ++++---- 3 files changed, 55 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -322,6 +322,7 @@ struct drm_i915_error_state {u64 fence[I915_MAX_NUM_FENCES ];struct intel_overlay_error_state *overlay;struct intel_display_error_state *display; +struct drm_i915_error_object *semaphore_obj;struct drm_i915_error_ring {bool valid;
drivers/gpu/drm/i915/i915_gpu_error.c +48 -4
100 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +6 -6
@@ -37,9 +37,9 @@ struct intel_hw_status_page {* do the writes, and that must have qw aligned offsets, simply pretend it's 8b. */ #define i915_semaphore_seqno_size sizeof(uint64_t) -#define GEN8_SIGNAL_OFFSET (to) \ +#define GEN8_SIGNAL_OFFSET (__ring, to) \ (i915_gem_obj_ggtt_offset(dev_priv->semaphore_obj) + \ - (ring->id * I915_NUM_RINGS * i915_semaphore_seqno_size) + \ + ((__ring)->id * I915_NUM_RINGS * i915_semaphore_seqno_size) + \ (i915_semaphore_seqno_size * (to)))#define GEN8_WAIT_OFFSET (__ring, from) \
@@ -51,10 +51,10 @@ struct intel_hw_status_page {if (!dev_priv->semaphore_obj) { \break ; \ } \ - ring->semaphore.signal_ggtt[RCS ] =GEN8_SIGNAL_OFFSET (RCS ); \ - ring->semaphore.signal_ggtt[VCS ] =GEN8_SIGNAL_OFFSET (VCS ); \ - ring->semaphore.signal_ggtt[BCS ] =GEN8_SIGNAL_OFFSET (BCS ); \ - ring->semaphore.signal_ggtt[VECS ] =GEN8_SIGNAL_OFFSET (VECS ); \ + ring->semaphore.signal_ggtt[RCS ] =GEN8_SIGNAL_OFFSET (ring,RCS ); \ + ring->semaphore.signal_ggtt[VCS ] =GEN8_SIGNAL_OFFSET (ring,VCS ); \ + ring->semaphore.signal_ggtt[BCS ] =GEN8_SIGNAL_OFFSET (ring,BCS ); \ + ring->semaphore.signal_ggtt[VECS ] =GEN8_SIGNAL_OFFSET (ring,VECS ); \ ring->semaphore.signal_ggtt[ring->id] =MI_SEMAPHORE_SYNC_INVALID ; \ }while (0 )
Signature · 1 line
1.9.0
Re: [PATCH 10/13] drm/i915/bdw: collect semaphore error state
Quoted 56 lines · Ben Widawsky
Since the semaphore information is in an object, just dump it, and let the user parse it later.
NOTE: The page being used for the semaphores are incoherent with the CPU. No matter what I do, I cannot figure out a way to read anything but 0s. Note that the semaphore waits are indeed working.
v2: Don't print signal, and wait (they should be the same). Instead, print
sync_seqno(Chris)v3: Free the semaphore error object (Chris)
v4: Fix semaphore offset calculation during error state collection (Ville)
Signed-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gpu_error.c | 52 ++++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_ringbuffer.h | 12 ++++---- 3 files changed, 55 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -322,6 +322,7 @@ struct drm_i915_error_state {u64 fence[I915_MAX_NUM_FENCES ];struct intel_overlay_error_state *overlay;struct intel_display_error_state *display; +struct drm_i915_error_object *semaphore_obj;struct drm_i915_error_ring {bool valid;drivers/gpu/drm/i915/i915_gpu_error.c +1
-2@@ -310,6 +310,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,struct drm_device *dev = error_priv->dev;drm_i915_private_t *dev_priv = dev->dev_private;struct drm_i915_error_state *error = error_priv->error; +struct drm_i915_error_object *obj;int i, j, page, offset, elt;if (!error) {@@ -360,8 +361,6 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, error->pinned_bo_count[0]);for (i =0 ; i <ARRAY_SIZE (error->ring); i++) { -struct drm_i915_error_object *obj; -if ((obj = error->ring[i].batchbuffer)) { err_printf(m, "%s --- gtt_offset = 0x%08x\n", dev_priv->ring[i].name,
drivers/gpu/drm/i915/i915_gpu_error.c int i915_error_state_to_str(struct drm_i915_error_state_buf *m, · line 439
Quoted 5 lines
drivers/gpu/drm/i915/i915_gpu_error.c +2
-0@@ -436,6 +435,19 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, } } + obj = error->semaphore_obj; +if (obj) {
Still won't pass under Chris's consitency radar.
Quoted 36 lines
drivers/gpu/drm/i915/i915_gpu_error.c +22
-0+err_printf (m,"Semaphore page = 0x%08x\n" , obj->gtt_offset); +for (elt =0 ; elt <PAGE_SIZE /16 ; elt +=4 ) { +err_printf (m,"[%04x] %08x %08x %08x %08x\n" , + elt *4 , + obj->pages[0 ][elt], + obj->pages[0 ][elt+1 ], + obj->pages[0 ][elt+2 ], + obj->pages[0 ][elt+3 ]); + } + } +if (error->overlay)intel_overlay_print_error_state (m, error->overlay);@@ -506,6 +518,7 @@ static void i915_error_state_free(struct kref *error_ref)kfree (error->ring[i].requests); } +i915_error_object_free (error->semaphore_obj);kfree (error->active_bo);kfree (error->overlay);kfree (error->display);@@ -797,6 +810,33 @@ i915_error_first_batchbuffer(struct drm_i915_private *dev_priv,return NULL ; } +static void gen8_record_semaphore_state (struct drm_i915_private *dev_priv, +struct drm_i915_error_state *error, +struct intel_ring_buffer *ring, +struct drm_i915_error_ring *ering) +{ +struct intel_ring_buffer *useless; +int i; + +if (!i915_semaphore_is_enabled (dev_priv->dev)) +return ;
drivers/gpu/drm/i915/i915_gpu_error.c i915_error_first_batchbuffer(struct drm_i915_private *dev_priv, · line 832
Quoted 10 lines
drivers/gpu/drm/i915/i915_gpu_error.c +10
-0+ +if (!error->semaphore_obj) + error->semaphore_obj = +i915_error_object_create (dev_priv, + dev_priv->semaphore_obj, + &dev_priv->gtt.base); + +for_each_ring (useless, dev_priv, i) { +u16 signal_offset = + (GEN8_SIGNAL_OFFSET (ring, i) /4 ) &PAGE_MASK ;
(... & PAGE_MASK) / 4;
Quoted 72 lines
drivers/gpu/drm/i915/i915_gpu_error.c +13
-2+u32 *tmp = error->semaphore_obj->pages[0 ]; + + ering->semaphore_mboxes[i] = tmp[signal_offset]; + ering->semaphore_seqno[i] = ring->semaphore.sync_seqno[i]; + } +} +static void gen6_record_semaphore_state (struct drm_i915_private *dev_priv,struct intel_ring_buffer *ring,struct drm_i915_error_ring *ering)@@ -814,6 +854,7 @@ static void gen6_record_semaphore_state(struct drm_i915_private *dev_priv, }static void i915_record_ring_state (struct drm_device *dev, +struct drm_i915_error_state *error,struct intel_ring_buffer *ring,struct drm_i915_error_ring *ering) {@@ -822,7 +863,10 @@ static void i915_record_ring_state(struct drm_device *dev,if (INTEL_INFO (dev)->gen >=6 ) { ering->rc_psmi =I915_READ (ring->mmio_base +0x50 ); ering->fault_reg =I915_READ (RING_FAULT_REG (ring)); -gen6_record_semaphore_state (dev_priv, ring, ering); +if (INTEL_INFO (dev)->gen >=8 ) +gen8_record_semaphore_state (dev_priv, error, ring, ering); +else +gen6_record_semaphore_state (dev_priv, ring, ering); }if (INTEL_INFO (dev)->gen >=4 ) {@@ -948,7 +992,7 @@ static void i915_gem_record_rings(struct drm_device *dev, error->ring[i].valid = true; -i915_record_ring_state (dev, ring, &error->ring[i]); +i915_record_ring_state (dev, error, ring, &error->ring[i]); error->ring[i].batchbuffer =i915_error_first_batchbuffer (dev_priv, ring);drivers/gpu/drm/i915/intel_ringbuffer.h +6
-6@@ -37,9 +37,9 @@ struct intel_hw_status_page {* do the writes, and that must have qw aligned offsets, simply pretend it's 8b. */ #define i915_semaphore_seqno_size sizeof(uint64_t) -#define GEN8_SIGNAL_OFFSET (to) \ +#define GEN8_SIGNAL_OFFSET (__ring, to) \ (i915_gem_obj_ggtt_offset(dev_priv->semaphore_obj) + \ - (ring->id * I915_NUM_RINGS * i915_semaphore_seqno_size) + \ + ((__ring)->id * I915_NUM_RINGS * i915_semaphore_seqno_size) + \ (i915_semaphore_seqno_size * (to)))#define GEN8_WAIT_OFFSET (__ring, from) \@@ -51,10 +51,10 @@ struct intel_hw_status_page {if (!dev_priv->semaphore_obj) { \break ; \ } \ - ring->semaphore.signal_ggtt[RCS ] =GEN8_SIGNAL_OFFSET (RCS ); \ - ring->semaphore.signal_ggtt[VCS ] =GEN8_SIGNAL_OFFSET (VCS ); \ - ring->semaphore.signal_ggtt[BCS ] =GEN8_SIGNAL_OFFSET (BCS ); \ - ring->semaphore.signal_ggtt[VECS ] =GEN8_SIGNAL_OFFSET (VECS ); \ + ring->semaphore.signal_ggtt[RCS ] =GEN8_SIGNAL_OFFSET (ring,RCS ); \ + ring->semaphore.signal_ggtt[VCS ] =GEN8_SIGNAL_OFFSET (ring,VCS ); \ + ring->semaphore.signal_ggtt[BCS ] =GEN8_SIGNAL_OFFSET (ring,BCS ); \ + ring->semaphore.signal_ggtt[VECS ] =GEN8_SIGNAL_OFFSET (ring,VECS ); \ ring->semaphore.signal_ggtt[ring->id] =MI_SEMAPHORE_SYNC_INVALID ; \ }while (0 )Signature · 1 line
1.9.0
Signature · 2 lines
Ville Syrjälä Intel OTC
Re: [PATCH 10/13] drm/i915/bdw: collect semaphore error state
Quoted 105 lines · Ville Syrjälä
Quoted 56 lines · Ben Widawsky
Since the semaphore information is in an object, just dump it, and let the user parse it later.
NOTE: The page being used for the semaphores are incoherent with the CPU. No matter what I do, I cannot figure out a way to read anything but 0s. Note that the semaphore waits are indeed working.
v2: Don't print signal, and wait (they should be the same). Instead, print
sync_seqno(Chris)v3: Free the semaphore error object (Chris)
v4: Fix semaphore offset calculation during error state collection (Ville)
Signed-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gpu_error.c | 52 ++++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_ringbuffer.h | 12 ++++---- 3 files changed, 55 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -322,6 +322,7 @@ struct drm_i915_error_state {u64 fence[I915_MAX_NUM_FENCES ];struct intel_overlay_error_state *overlay;struct intel_display_error_state *display; +struct drm_i915_error_object *semaphore_obj;struct drm_i915_error_ring {bool valid;drivers/gpu/drm/i915/i915_gpu_error.c +1
-2@@ -310,6 +310,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,struct drm_device *dev = error_priv->dev;drm_i915_private_t *dev_priv = dev->dev_private;struct drm_i915_error_state *error = error_priv->error; +struct drm_i915_error_object *obj;int i, j, page, offset, elt;if (!error) {@@ -360,8 +361,6 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, error->pinned_bo_count[0]);for (i =0 ; i <ARRAY_SIZE (error->ring); i++) { -struct drm_i915_error_object *obj; -if ((obj = error->ring[i].batchbuffer)) { err_printf(m, "%s --- gtt_offset = 0x%08x\n", dev_priv->ring[i].name,drivers/gpu/drm/i915/i915_gpu_error.c int i915_error_state_to_str(struct drm_i915_error_state_buf *m, · line 439
Quoted 5 lines
drivers/gpu/drm/i915/i915_gpu_error.c +2
-0@@ -436,6 +435,19 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, } } + obj = error->semaphore_obj; +if (obj) {Still won't pass under Chris's consitency radar.
Quoted 40 lines
drivers/gpu/drm/i915/i915_gpu_error.c +26
-0+err_printf (m,"Semaphore page = 0x%08x\n" , obj->gtt_offset); +for (elt =0 ; elt <PAGE_SIZE /16 ; elt +=4 ) { +err_printf (m,"[%04x] %08x %08x %08x %08x\n" , + elt *4 , + obj->pages[0 ][elt], + obj->pages[0 ][elt+1 ], + obj->pages[0 ][elt+2 ], + obj->pages[0 ][elt+3 ]); + } + } +if (error->overlay)intel_overlay_print_error_state (m, error->overlay);@@ -506,6 +518,7 @@ static void i915_error_state_free(struct kref *error_ref)kfree (error->ring[i].requests); } +i915_error_object_free (error->semaphore_obj);kfree (error->active_bo);kfree (error->overlay);kfree (error->display);@@ -797,6 +810,33 @@ i915_error_first_batchbuffer(struct drm_i915_private *dev_priv,return NULL ; } +static void gen8_record_semaphore_state (struct drm_i915_private *dev_priv, +struct drm_i915_error_state *error, +struct intel_ring_buffer *ring, +struct drm_i915_error_ring *ering) +{ +struct intel_ring_buffer *useless; +int i; + +if (!i915_semaphore_is_enabled (dev_priv->dev)) +return ; + +if (!error->semaphore_obj) + error->semaphore_obj = + i915_error_object_create(dev_priv,
Quoted 9 lines
drivers/gpu/drm/i915/i915_gpu_error.c i915_error_first_batchbuffer(struct drm_i915_private *dev_priv, · line 832
Quoted 6 lines
drivers/gpu/drm/i915/i915_gpu_error.c +6
-0+ dev_priv->semaphore_obj, + &dev_priv->gtt.base); + +for_each_ring (useless, dev_priv, i) { +u16 signal_offset = + (GEN8_SIGNAL_OFFSET (ring, i) /4 ) &PAGE_MASK ;(... &
PAGE_MASK) / 4;
Nice catch.
Quoted 76 lines
Quoted 72 lines
drivers/gpu/drm/i915/i915_gpu_error.c +13
-2+u32 *tmp = error->semaphore_obj->pages[0 ]; + + ering->semaphore_mboxes[i] = tmp[signal_offset]; + ering->semaphore_seqno[i] = ring->semaphore.sync_seqno[i]; + } +} +static void gen6_record_semaphore_state (struct drm_i915_private *dev_priv,struct intel_ring_buffer *ring,struct drm_i915_error_ring *ering)@@ -814,6 +854,7 @@ static void gen6_record_semaphore_state(struct drm_i915_private *dev_priv, }static void i915_record_ring_state (struct drm_device *dev, +struct drm_i915_error_state *error,struct intel_ring_buffer *ring,struct drm_i915_error_ring *ering) {@@ -822,7 +863,10 @@ static void i915_record_ring_state(struct drm_device *dev,if (INTEL_INFO (dev)->gen >=6 ) { ering->rc_psmi =I915_READ (ring->mmio_base +0x50 ); ering->fault_reg =I915_READ (RING_FAULT_REG (ring)); -gen6_record_semaphore_state (dev_priv, ring, ering); +if (INTEL_INFO (dev)->gen >=8 ) +gen8_record_semaphore_state (dev_priv, error, ring, ering); +else +gen6_record_semaphore_state (dev_priv, ring, ering); }if (INTEL_INFO (dev)->gen >=4 ) {@@ -948,7 +992,7 @@ static void i915_gem_record_rings(struct drm_device *dev, error->ring[i].valid = true; -i915_record_ring_state (dev, ring, &error->ring[i]); +i915_record_ring_state (dev, error, ring, &error->ring[i]); error->ring[i].batchbuffer =i915_error_first_batchbuffer (dev_priv, ring);drivers/gpu/drm/i915/intel_ringbuffer.h +6
-6@@ -37,9 +37,9 @@ struct intel_hw_status_page {* do the writes, and that must have qw aligned offsets, simply pretend it's 8b. */ #define i915_semaphore_seqno_size sizeof(uint64_t) -#define GEN8_SIGNAL_OFFSET (to) \ +#define GEN8_SIGNAL_OFFSET (__ring, to) \ (i915_gem_obj_ggtt_offset(dev_priv->semaphore_obj) + \ - (ring->id * I915_NUM_RINGS * i915_semaphore_seqno_size) + \ + ((__ring)->id * I915_NUM_RINGS * i915_semaphore_seqno_size) + \ (i915_semaphore_seqno_size * (to)))#define GEN8_WAIT_OFFSET (__ring, from) \@@ -51,10 +51,10 @@ struct intel_hw_status_page {if (!dev_priv->semaphore_obj) { \break ; \ } \ - ring->semaphore.signal_ggtt[RCS ] =GEN8_SIGNAL_OFFSET (RCS ); \ - ring->semaphore.signal_ggtt[VCS ] =GEN8_SIGNAL_OFFSET (VCS ); \ - ring->semaphore.signal_ggtt[BCS ] =GEN8_SIGNAL_OFFSET (BCS ); \ - ring->semaphore.signal_ggtt[VECS ] =GEN8_SIGNAL_OFFSET (VECS ); \ + ring->semaphore.signal_ggtt[RCS ] =GEN8_SIGNAL_OFFSET (ring,RCS ); \ + ring->semaphore.signal_ggtt[VCS ] =GEN8_SIGNAL_OFFSET (ring,VCS ); \ + ring->semaphore.signal_ggtt[BCS ] =GEN8_SIGNAL_OFFSET (ring,BCS ); \ + ring->semaphore.signal_ggtt[VECS ] =GEN8_SIGNAL_OFFSET (ring,VECS ); \ ring->semaphore.signal_ggtt[ring->id] =MI_SEMAPHORE_SYNC_INVALID ; \ }while (0 )Signature · 1 line
1.9.0Signature · 2 lines
Ville Syrjälä Intel OTC
Signature · 5 lines
Ben Widawsky, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 11/13 drm/i915: unleash semaphores on gen8
In reply to Ben WidawskyEverything should be lined up now to make gen8 semaphores work like they did on previous generations, so just do it.
--- drivers/gpu/drm/i915/i915_drv.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +0 -6
@@ -401,12 +401,6 @@ bool i915_semaphore_is_enabled(struct drm_device *dev)if (INTEL_INFO (dev)->gen <6 )return false; -/* Until we get further testing... */ -if (IS_GEN8 (dev)) { -WARN_ON (!i915.preliminary_hw_support); -return false; - } -if (i915.semaphores >=0 )return i915.semaphores;
Signature · 1 line
1.9.0
PATCH 12/13 drm/i915: semaphore debugfs
In reply to Ben WidawskySimple debugfs file to display the current state of semaphores. This is useful if you want to see the state without hanging the GPU.
NOTE: This patch is optional to the series.
NOTE2: Like the GPU error state collection, the reads are currently incoherent.
--- drivers/gpu/drm/i915/i915_debugfs.c | 70 +++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +70 -0
@@ -2235,6 +2235,75 @@ static int i915_display_info(struct seq_file *m, void *unused)return 0 ; } +static int i915_semaphore_status (struct seq_file *m,void *unused) +{ +struct drm_info_node *node = (struct drm_info_node *) m->private; +struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_ring_buffer *ring; +int i, j, ret; + +if (!i915_semaphore_is_enabled (dev)) { +seq_puts (m,"Semaphores are disabled\n" ); +return 0 ; + } + + ret =mutex_lock_interruptible (&dev->struct_mutex); +if (ret) +return ret; + +if (IS_BROADWELL (dev)) { +struct page *page; +uint64_t *seqno; + + page =i915_gem_object_get_page (dev_priv->semaphore_obj,0 ); + + seqno = (uint64_t *)kmap_atomic (page); +for_each_ring (ring, dev_priv, i) { +uint64_t offset; + +seq_printf (m,"%s\n" , ring->name); + +seq_puts (m," Last signal:" ); +for (j =0 ; j <I915_NUM_RINGS ; j++) { + offset = i *I915_NUM_RINGS + j; +seq_printf (m,"0x%08llx (0x%02llx) " , + seqno[offset], offset *8 ); + } +seq_putc (m,'\n' ); + +seq_puts (m," Last wait: " ); +for (j =0 ; j <I915_NUM_RINGS ; j++) { + offset = i + (j *I915_NUM_RINGS ); +seq_printf (m,"0x%08llx (0x%02llx) " , + seqno[offset], offset *8 ); + } +seq_putc (m,'\n' ); + + } +kunmap_atomic (seqno); + }else { +seq_puts (m," Last signal:" ); +for_each_ring (ring, dev_priv, i) +for (j =0 ; j <I915_NUM_RINGS ; j++) +seq_printf (m,"0x%08x\n" , +I915_READ (ring->semaphore.mbox.signal[j])); +seq_putc (m,'\n' ); + } + +seq_puts (m,"\nSync seqno:\n" ); +for_each_ring (ring, dev_priv, i) { +for (j =0 ; j <I915_NUM_RINGS ; j++) { +seq_printf (m," 0x%08x " , ring->semaphore.sync_seqno[j]); + } +seq_putc (m,'\n' ); + } +seq_putc (m,'\n' ); + +mutex_unlock (&dev->struct_mutex); +return 0 ; +} +struct pipe_crc_info {const char *name;struct drm_device *dev;
@@ -3681,6 +3750,7 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_pc8_status", i915_pc8_status, 0}, {"i915_power_domain_info", i915_power_domain_info, 0}, {"i915_display_info", i915_display_info, 0}, + {"i915_semaphore_status", i915_semaphore_status, 0}, };#define I915_DEBUGFS_ENTRIES ARRAY_SIZE(i915_debugfs_list)
Signature · 1 line
1.9.0
PATCH 13/13 DONT_MERGE drm/i915: FORCE_RESTORE for gen8 semaphores
In reply to Ben WidawskyThis appears to not actually be needed on the current code. Just putting it on the ML so we can point bug reports at it later.
--- drivers/gpu/drm/i915/i915_gem_context.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/i915/i915_gem_context.c +7 -0
@@ -655,6 +655,13 @@ static int do_switch(struct intel_ring_buffer *ring,if (!to->is_initialized ||i915_gem_context_is_default (to)) hw_flags |=MI_RESTORE_INHIBIT ; +/* When SW intends to use semaphore signaling between Command streamers, +* it must avoid lite restores in HW by programming "Force Restore" bit +* to ‘1’ in context descriptor during context submission +*/ +if (IS_GEN8 (ring->dev) &&i915_semaphore_is_enabled (ring->dev)) + hw_flags |=MI_FORCE_RESTORE ; + ret =mi_set_context (ring, to, hw_flags);if (ret) goto unpin_out;
Signature · 6 lines
1.9.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Looks like I neglected to give any kind of final conclusion on this series. It looks like it should do the right thing, apart from the PAGE_MASK vs. /4 bug. The other things I commented on were just minor nits. And if we drop the poll and force restore patches, I'm happy with the result ;)
Signature · 2 lines
Ville Syrjälä Intel OTC