Legacy engine initialization refactoring
Subsystems (2)
cover Legacy engine initialization refactoring
From: Tvrtko Ursulin <[email protected]>
Preparation step towards unifying what can be unified between legacy and execlist.
This series tries to simplify the engine initializers by moving some of the commonatility replicated between all of the engines into a shared helper function - the same approach as in intel_lrc.c.
Also tries to simplify the semaphore initialization by replacing some verbose code with either a completely programatical code (Gen8), or a combination of a data table and logic (Gen6+).
To be discussed if people see this as a worthwhile improvement. It does shrink both the source and generated binary (~2k), but more importantly makes the initializers easier to read and understand. Hopefully not only for me.
Next step of unification can be employing the same data-driven setup + per-engine constructor loop driven approach as recently has been implemented in intel_lrc.c. I think Dave already has some patches for that. And then finally extracting commonality between intel_ringbuffer.c and intel_lrc.c gets easier to spot and to do (and review).
Tvrtko Ursulin (13):
drm/i915: Consolidate write_tail vfunc initializer drm/i915: Consolidate add_request vfunc
drm/i915: Consolidate seqno_barrier vfunc
drm/i915: Consolidate get and put irq vfuncs drm/i915: Consolidate get/set_seqno
drm/i915: Consolidate init_hw vfunc
drm/i915: Consolidate dispatch_execbuffer vfunc drm/i915: Consolidate semaphore vfuncs init drm/i915: Compact Gen8 semaphore initialization drm/i915: Compact gen8_ring_sync
drm/i915: Consolidate legacy semaphore initialization drm/i915: Remove redundant warning and consolidate gen8 render
semaphore vfunc
drm/i915: Trim some if-else braces
drivers/gpu/drm/i915/intel_ringbuffer.c | 340 ++++++++++++++------------------ drivers/gpu/drm/i915/intel_ringbuffer.h | 12 -- 2 files changed, 143 insertions(+), 209 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/13 drm/i915: Consolidate write_tail vfunc initializer
From: Tvrtko Ursulin <[email protected]>
Introduce a function which initializes vfuncs mostly common across engines and move write_tail initialization in it since only one engine overrides the default.
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +19 -8
@@ -2873,6 +2873,12 @@ static int gen6_ring_flush(struct drm_i915_gem_request *req,return 0 ; } +static void intel_ring_default_vfuncs (struct drm_i915_private *dev_priv, +struct intel_engine_cs *engine) +{ + engine->write_tail = ring_write_tail; +} +int intel_init_render_ring_buffer (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -2886,6 +2892,8 @@ int intel_init_render_ring_buffer(struct drm_device *dev) engine->hw_id =0 ; engine->mmio_base =RENDER_RING_BASE ; +intel_ring_default_vfuncs (dev_priv, engine); +if (INTEL_GEN (dev_priv) >=8 ) {if (i915_semaphore_is_enabled (dev_priv)) { obj =i915_gem_object_create (dev,4096 );
@@ -2977,7 +2985,6 @@ int intel_init_render_ring_buffer(struct drm_device *dev) } engine->irq_enable_mask =I915_USER_INTERRUPT ; } - engine->write_tail = ring_write_tail;if (IS_HASWELL (dev_priv)) engine->dispatch_execbuffer = hsw_ring_dispatch_execbuffer;
@@ -3036,7 +3043,8 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) engine->exec_id =I915_EXEC_BSD ; engine->hw_id =1 ; - engine->write_tail = ring_write_tail; +intel_ring_default_vfuncs (dev_priv, engine); +if (INTEL_GEN (dev_priv) >=6 ) { engine->mmio_base =GEN6_BSD_RING_BASE ;/* gen6 bsd needs a special wa for tail updates */
@@ -3114,9 +3122,10 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev) engine->id =VCS2 ; engine->exec_id =I915_EXEC_BSD ; engine->hw_id =4 ; - - engine->write_tail = ring_write_tail; engine->mmio_base =GEN8_BSD2_RING_BASE ; + +intel_ring_default_vfuncs (dev_priv, engine); + engine->flush = gen6_bsd_ring_flush; engine->add_request = gen6_add_request; engine->irq_seqno_barrier = gen6_seqno_barrier;
@@ -3147,9 +3156,10 @@ int intel_init_blt_ring_buffer(struct drm_device *dev) engine->id =BCS ; engine->exec_id =I915_EXEC_BLT ; engine->hw_id =2 ; - engine->mmio_base =BLT_RING_BASE ; - engine->write_tail = ring_write_tail; + +intel_ring_default_vfuncs (dev_priv, engine); + engine->flush = gen6_ring_flush; engine->add_request = gen6_add_request; engine->irq_seqno_barrier = gen6_seqno_barrier;
@@ -3207,9 +3217,10 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev) engine->id =VECS ; engine->exec_id =I915_EXEC_VEBOX ; engine->hw_id =3 ; - engine->mmio_base =VEBOX_RING_BASE ; - engine->write_tail = ring_write_tail; + +intel_ring_default_vfuncs (dev_priv, engine); + engine->flush = gen6_ring_flush; engine->add_request = gen6_add_request; engine->irq_seqno_barrier = gen6_seqno_barrier;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/13 drm/i915: Consolidate add_request vfunc
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
All engines apart from render select this based on Gen.
Move it to the common helper as well.
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +5 -7
@@ -2877,6 +2877,11 @@ static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv, struct intel_engine_cs *engine) { engine->write_tail = ring_write_tail; + +if (INTEL_GEN (dev_priv) >=6 ) + engine->add_request = gen6_add_request; +else + engine->add_request = i9xx_add_request; }int intel_init_render_ring_buffer (struct drm_device *dev)
@@ -2928,7 +2933,6 @@ int intel_init_render_ring_buffer(struct drm_device *dev) } }else if (INTEL_GEN (dev_priv) >=6 ) { engine->init_context = intel_rcs_ctx_init; - engine->add_request = gen6_add_request; engine->flush = gen7_render_ring_flush;if (IS_GEN6 (dev_priv)) engine->flush = gen6_render_ring_flush;
@@ -2969,7 +2973,6 @@ int intel_init_render_ring_buffer(struct drm_device *dev) engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT |GT_RENDER_PIPECTL_NOTIFY_INTERRUPT ; }else { - engine->add_request = i9xx_add_request;if (INTEL_GEN (dev_priv) <4 ) engine->flush = gen2_render_ring_flush;else
@@ -3051,7 +3054,6 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)if (IS_GEN6 (dev_priv)) engine->write_tail = gen6_bsd_ring_write_tail; engine->flush = gen6_bsd_ring_flush; - engine->add_request = gen6_add_request; engine->irq_seqno_barrier = gen6_seqno_barrier; engine->get_seqno = ring_get_seqno; engine->set_seqno = ring_set_seqno;
@@ -3091,7 +3093,6 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) }else { engine->mmio_base =BSD_RING_BASE ; engine->flush = bsd_ring_flush; - engine->add_request = i9xx_add_request; engine->get_seqno = ring_get_seqno; engine->set_seqno = ring_set_seqno;if (IS_GEN5 (dev_priv)) {
@@ -3127,7 +3128,6 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev)intel_ring_default_vfuncs (dev_priv, engine); engine->flush = gen6_bsd_ring_flush; - engine->add_request = gen6_add_request; engine->irq_seqno_barrier = gen6_seqno_barrier; engine->get_seqno = ring_get_seqno; engine->set_seqno = ring_set_seqno;
@@ -3161,7 +3161,6 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)intel_ring_default_vfuncs (dev_priv, engine); engine->flush = gen6_ring_flush; - engine->add_request = gen6_add_request; engine->irq_seqno_barrier = gen6_seqno_barrier; engine->get_seqno = ring_get_seqno; engine->set_seqno = ring_set_seqno;
@@ -3222,7 +3221,6 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev)intel_ring_default_vfuncs (dev_priv, engine); engine->flush = gen6_ring_flush; - engine->add_request = gen6_add_request; engine->irq_seqno_barrier = gen6_seqno_barrier; engine->get_seqno = ring_get_seqno; engine->set_seqno = ring_set_seqno;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/13 drm/i915: Consolidate seqno_barrier vfunc
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +4 -7
@@ -2878,10 +2878,12 @@ static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv, { engine->write_tail = ring_write_tail; -if (INTEL_GEN (dev_priv) >=6 ) +if (INTEL_GEN (dev_priv) >=6 ) { engine->add_request = gen6_add_request; -else + engine->irq_seqno_barrier = gen6_seqno_barrier; + }else { engine->add_request = i9xx_add_request; + } }int intel_init_render_ring_buffer (struct drm_device *dev)
@@ -2939,7 +2941,6 @@ int intel_init_render_ring_buffer(struct drm_device *dev) engine->irq_get = gen6_ring_get_irq; engine->irq_put = gen6_ring_put_irq; engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT ; - engine->irq_seqno_barrier = gen6_seqno_barrier; engine->get_seqno = ring_get_seqno; engine->set_seqno = ring_set_seqno;if (i915_semaphore_is_enabled (dev_priv)) {
@@ -3054,7 +3055,6 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)if (IS_GEN6 (dev_priv)) engine->write_tail = gen6_bsd_ring_write_tail; engine->flush = gen6_bsd_ring_flush; - engine->irq_seqno_barrier = gen6_seqno_barrier; engine->get_seqno = ring_get_seqno; engine->set_seqno = ring_set_seqno;if (INTEL_GEN (dev_priv) >=8 ) {
@@ -3128,7 +3128,6 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev)intel_ring_default_vfuncs (dev_priv, engine); engine->flush = gen6_bsd_ring_flush; - engine->irq_seqno_barrier = gen6_seqno_barrier; engine->get_seqno = ring_get_seqno; engine->set_seqno = ring_set_seqno; engine->irq_enable_mask =
@@ -3161,7 +3160,6 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)intel_ring_default_vfuncs (dev_priv, engine); engine->flush = gen6_ring_flush; - engine->irq_seqno_barrier = gen6_seqno_barrier; engine->get_seqno = ring_get_seqno; engine->set_seqno = ring_set_seqno;if (INTEL_GEN (dev_priv) >=8 ) {
@@ -3221,7 +3219,6 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev)intel_ring_default_vfuncs (dev_priv, engine); engine->flush = gen6_ring_flush; - engine->irq_seqno_barrier = gen6_seqno_barrier; engine->get_seqno = ring_get_seqno; engine->set_seqno = ring_set_seqno;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/13 drm/i915: Consolidate get and put irq vfuncs
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 46 ++++++++++++--------------------- 1 file changed, 17 insertions(+), 29 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +17 -29
@@ -2884,6 +2884,23 @@ static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv, }else { engine->add_request = i9xx_add_request; } + +if (INTEL_GEN (dev_priv) >=8 ) { + engine->irq_get = gen8_ring_get_irq; + engine->irq_put = gen8_ring_put_irq; + }else if (INTEL_GEN (dev_priv) >=6 ) { + engine->irq_get = gen6_ring_get_irq; + engine->irq_put = gen6_ring_put_irq; + }else if (IS_GEN5 (dev_priv)) { + engine->irq_get = gen5_ring_get_irq; + engine->irq_put = gen5_ring_put_irq; + }else if (INTEL_GEN (dev_priv) >=3 ) { + engine->irq_get = i9xx_ring_get_irq; + engine->irq_put = i9xx_ring_put_irq; + }else if (IS_GEN2 (dev_priv)) { + engine->irq_get = i8xx_ring_get_irq; + engine->irq_put = i8xx_ring_put_irq; + } }int intel_init_render_ring_buffer (struct drm_device *dev)
@@ -2922,8 +2939,6 @@ int intel_init_render_ring_buffer(struct drm_device *dev) engine->init_context = intel_rcs_ctx_init; engine->add_request = gen8_render_add_request; engine->flush = gen8_render_ring_flush; - engine->irq_get = gen8_ring_get_irq; - engine->irq_put = gen8_ring_put_irq; engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT ; engine->get_seqno = ring_get_seqno; engine->set_seqno = ring_set_seqno;
@@ -2938,8 +2953,6 @@ int intel_init_render_ring_buffer(struct drm_device *dev) engine->flush = gen7_render_ring_flush;if (IS_GEN6 (dev_priv)) engine->flush = gen6_render_ring_flush; - engine->irq_get = gen6_ring_get_irq; - engine->irq_put = gen6_ring_put_irq; engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT ; engine->get_seqno = ring_get_seqno; engine->set_seqno = ring_set_seqno;
@@ -2969,8 +2982,6 @@ int intel_init_render_ring_buffer(struct drm_device *dev) engine->flush = gen4_render_ring_flush; engine->get_seqno = pc_render_get_seqno; engine->set_seqno = pc_render_set_seqno; - engine->irq_get = gen5_ring_get_irq; - engine->irq_put = gen5_ring_put_irq; engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT |GT_RENDER_PIPECTL_NOTIFY_INTERRUPT ; }else {
@@ -2980,13 +2991,6 @@ int intel_init_render_ring_buffer(struct drm_device *dev) engine->flush = gen4_render_ring_flush; engine->get_seqno = ring_get_seqno; engine->set_seqno = ring_set_seqno; -if (IS_GEN2 (dev_priv)) { - engine->irq_get = i8xx_ring_get_irq; - engine->irq_put = i8xx_ring_put_irq; - }else { - engine->irq_get = i9xx_ring_get_irq; - engine->irq_put = i9xx_ring_put_irq; - } engine->irq_enable_mask =I915_USER_INTERRUPT ; }
@@ -3060,8 +3064,6 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)if (INTEL_GEN (dev_priv) >=8 ) { engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT ; - engine->irq_get = gen8_ring_get_irq; - engine->irq_put = gen8_ring_put_irq; engine->dispatch_execbuffer = gen8_ring_dispatch_execbuffer;if (i915_semaphore_is_enabled (dev_priv)) {
@@ -3071,8 +3073,6 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) } }else { engine->irq_enable_mask =GT_BSD_USER_INTERRUPT ; - engine->irq_get = gen6_ring_get_irq; - engine->irq_put = gen6_ring_put_irq; engine->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;if (i915_semaphore_is_enabled (dev_priv)) {
@@ -3097,12 +3097,8 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) engine->set_seqno = ring_set_seqno;if (IS_GEN5 (dev_priv)) { engine->irq_enable_mask =ILK_BSD_USER_INTERRUPT ; - engine->irq_get = gen5_ring_get_irq; - engine->irq_put = gen5_ring_put_irq; }else { engine->irq_enable_mask =I915_BSD_USER_INTERRUPT ; - engine->irq_get = i9xx_ring_get_irq; - engine->irq_put = i9xx_ring_put_irq; } engine->dispatch_execbuffer = i965_dispatch_execbuffer; }
@@ -3132,8 +3128,6 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev) engine->set_seqno = ring_set_seqno; engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT <<GEN8_VCS2_IRQ_SHIFT ; - engine->irq_get = gen8_ring_get_irq; - engine->irq_put = gen8_ring_put_irq; engine->dispatch_execbuffer = gen8_ring_dispatch_execbuffer;if (i915_semaphore_is_enabled (dev_priv)) {
@@ -3165,8 +3159,6 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)if (INTEL_GEN (dev_priv) >=8 ) { engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT <<GEN8_BCS_IRQ_SHIFT ; - engine->irq_get = gen8_ring_get_irq; - engine->irq_put = gen8_ring_put_irq; engine->dispatch_execbuffer = gen8_ring_dispatch_execbuffer;if (i915_semaphore_is_enabled (dev_priv)) { engine->semaphore.sync_to = gen8_ring_sync;
@@ -3175,8 +3167,6 @@ int intel_init_blt_ring_buffer(struct drm_device *dev) } }else { engine->irq_enable_mask =GT_BLT_USER_INTERRUPT ; - engine->irq_get = gen6_ring_get_irq; - engine->irq_put = gen6_ring_put_irq; engine->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;if (i915_semaphore_is_enabled (dev_priv)) { engine->semaphore.signal = gen6_signal;
@@ -3225,8 +3215,6 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev)if (INTEL_GEN (dev_priv) >=8 ) { engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT <<GEN8_VECS_IRQ_SHIFT ; - engine->irq_get = gen8_ring_get_irq; - engine->irq_put = gen8_ring_put_irq; engine->dispatch_execbuffer = gen8_ring_dispatch_execbuffer;if (i915_semaphore_is_enabled (dev_priv)) { engine->semaphore.sync_to = gen8_ring_sync;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 04/13] drm/i915: Consolidate get and put irq vfuncs
Quoted 13 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Signed-off-by Tvrtko Ursulin <[email protected]>--- drivers/gpu/drm/i915/intel_ringbuffer.c | 46 ++++++++++++--------------------- 1 file changed, 17 insertions(+), 29 deletions(-)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0@@ -2884,6 +2884,23 @@ static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv, }else {
drivers/gpu/drm/i915/intel_ringbuffer.c static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv, · line 2894
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +8
-0engine->add_request = i9xx_add_request; } + +if (INTEL_GEN (dev_priv) >=8 ) { + engine->irq_get = gen8_ring_get_irq; + engine->irq_put = gen8_ring_put_irq; + }else if (INTEL_GEN (dev_priv) >=6 ) { + engine->irq_get = gen6_ring_get_irq; + engine->irq_put = gen6_ring_put_irq; + }else if (IS_GEN5 (dev_priv)) {
For the sake of consistency else if (INTEL_GEN(dev_priv) >= 5
drivers/gpu/drm/i915/intel_ringbuffer.c static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv, · line 2900
Quoted 6 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +6
-0+ engine->irq_get = gen5_ring_get_irq; + engine->irq_put = gen5_ring_put_irq; + }else if (INTEL_GEN (dev_priv) >=3 ) { + engine->irq_get = i9xx_ring_get_irq; + engine->irq_put = i9xx_ring_put_irq; + }else if (IS_GEN2 (dev_priv)) {
and a plain else here ?
Quoted 3 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +3
-0+ engine->irq_get = i8xx_ring_get_irq; + engine->irq_put = i8xx_ring_put_irq; + }
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/13 drm/i915: Consolidate get/set_seqno
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +2 -16
@@ -2877,6 +2877,8 @@ static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv, struct intel_engine_cs *engine) { engine->write_tail = ring_write_tail; + engine->get_seqno = ring_get_seqno; + engine->set_seqno = ring_set_seqno;if (INTEL_GEN (dev_priv) >=6 ) { engine->add_request = gen6_add_request;
@@ -2940,8 +2942,6 @@ int intel_init_render_ring_buffer(struct drm_device *dev) engine->add_request = gen8_render_add_request; engine->flush = gen8_render_ring_flush; engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT ; - engine->get_seqno = ring_get_seqno; - engine->set_seqno = ring_set_seqno;if (i915_semaphore_is_enabled (dev_priv)) {WARN_ON (!dev_priv->semaphore_obj); engine->semaphore.sync_to = gen8_ring_sync;
@@ -2954,8 +2954,6 @@ int intel_init_render_ring_buffer(struct drm_device *dev)if (IS_GEN6 (dev_priv)) engine->flush = gen6_render_ring_flush; engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT ; - engine->get_seqno = ring_get_seqno; - engine->set_seqno = ring_set_seqno;if (i915_semaphore_is_enabled (dev_priv)) { engine->semaphore.sync_to = gen6_ring_sync; engine->semaphore.signal = gen6_signal;
@@ -2989,8 +2987,6 @@ int intel_init_render_ring_buffer(struct drm_device *dev) engine->flush = gen2_render_ring_flush; else engine->flush = gen4_render_ring_flush; - engine->get_seqno = ring_get_seqno; - engine->set_seqno = ring_set_seqno; engine->irq_enable_mask =I915_USER_INTERRUPT ; }
@@ -3059,8 +3055,6 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)if (IS_GEN6 (dev_priv)) engine->write_tail = gen6_bsd_ring_write_tail; engine->flush = gen6_bsd_ring_flush; - engine->get_seqno = ring_get_seqno; - engine->set_seqno = ring_set_seqno;if (INTEL_GEN (dev_priv) >=8 ) { engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT ;
@@ -3093,8 +3087,6 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) }else { engine->mmio_base =BSD_RING_BASE ; engine->flush = bsd_ring_flush; - engine->get_seqno = ring_get_seqno; - engine->set_seqno = ring_set_seqno;if (IS_GEN5 (dev_priv)) { engine->irq_enable_mask =ILK_BSD_USER_INTERRUPT ; }else {
@@ -3124,8 +3116,6 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev)intel_ring_default_vfuncs (dev_priv, engine); engine->flush = gen6_bsd_ring_flush; - engine->get_seqno = ring_get_seqno; - engine->set_seqno = ring_set_seqno; engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT <<GEN8_VCS2_IRQ_SHIFT ; engine->dispatch_execbuffer =
@@ -3154,8 +3144,6 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)intel_ring_default_vfuncs (dev_priv, engine); engine->flush = gen6_ring_flush; - engine->get_seqno = ring_get_seqno; - engine->set_seqno = ring_set_seqno;if (INTEL_GEN (dev_priv) >=8 ) { engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT <<GEN8_BCS_IRQ_SHIFT ;
@@ -3209,8 +3197,6 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev)intel_ring_default_vfuncs (dev_priv, engine); engine->flush = gen6_ring_flush; - engine->get_seqno = ring_get_seqno; - engine->set_seqno = ring_set_seqno;if (INTEL_GEN (dev_priv) >=8 ) { engine->irq_enable_mask =
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/13 drm/i915: Consolidate init_hw vfunc
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -4
@@ -2876,6 +2876,7 @@ static int gen6_ring_flush(struct drm_i915_gem_request *req,static void intel_ring_default_vfuncs (struct drm_i915_private *dev_priv,struct intel_engine_cs *engine) { + engine->init_hw = init_ring_common; engine->write_tail = ring_write_tail; engine->get_seqno = ring_get_seqno; engine->set_seqno = ring_set_seqno;
@@ -3094,7 +3095,6 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) } engine->dispatch_execbuffer = i965_dispatch_execbuffer; } - engine->init_hw = init_ring_common;return intel_init_ring_buffer (dev, engine); }
@@ -3125,7 +3125,6 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev) engine->semaphore.signal = gen8_xcs_signal;GEN8_RING_SEMAPHORE_INIT (engine); } - engine->init_hw = init_ring_common;return intel_init_ring_buffer (dev, engine); }
@@ -3178,7 +3177,6 @@ int intel_init_blt_ring_buffer(struct drm_device *dev) engine->semaphore.mbox.signal[VCS2 ] =GEN6_NOSYNC ; } } - engine->init_hw = init_ring_common;return intel_init_ring_buffer (dev, engine); }
@@ -3227,7 +3225,6 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev) engine->semaphore.mbox.signal[VCS2 ] =GEN6_NOSYNC ; } } - engine->init_hw = init_ring_common;return intel_init_ring_buffer (dev, engine); }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/13 drm/i915: Consolidate dispatch_execbuffer vfunc
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +6 -19
@@ -2881,11 +2881,15 @@ static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv, engine->get_seqno = ring_get_seqno; engine->set_seqno = ring_set_seqno; -if (INTEL_GEN (dev_priv) >=6 ) { +if (INTEL_GEN (dev_priv) >=8 ) { + engine->dispatch_execbuffer = gen8_ring_dispatch_execbuffer; + }else if (INTEL_GEN (dev_priv) >=6 ) { engine->add_request = gen6_add_request; engine->irq_seqno_barrier = gen6_seqno_barrier; + engine->dispatch_execbuffer = gen6_ring_dispatch_execbuffer; }else { engine->add_request = i9xx_add_request; + engine->dispatch_execbuffer = i965_dispatch_execbuffer; }if (INTEL_GEN (dev_priv) >=8 ) {
@@ -2993,15 +2997,9 @@ int intel_init_render_ring_buffer(struct drm_device *dev)if (IS_HASWELL (dev_priv)) engine->dispatch_execbuffer = hsw_ring_dispatch_execbuffer; -else if (IS_GEN8 (dev_priv)) - engine->dispatch_execbuffer = gen8_ring_dispatch_execbuffer; -else if (INTEL_GEN (dev_priv) >=6 ) - engine->dispatch_execbuffer = gen6_ring_dispatch_execbuffer; -else if (INTEL_GEN (dev_priv) >=4 ) - engine->dispatch_execbuffer = i965_dispatch_execbuffer;else if (IS_I830 (dev_priv) ||IS_845G (dev_priv)) engine->dispatch_execbuffer = i830_dispatch_execbuffer; -else +else if (INTEL_GEN (dev_priv) <=3 ) engine->dispatch_execbuffer = i915_dispatch_execbuffer; engine->init_hw = init_render_ring; engine->cleanup = render_ring_cleanup;
@@ -3059,8 +3057,6 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)if (INTEL_GEN (dev_priv) >=8 ) { engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT ; - engine->dispatch_execbuffer = - gen8_ring_dispatch_execbuffer;if (i915_semaphore_is_enabled (dev_priv)) { engine->semaphore.sync_to = gen8_ring_sync; engine->semaphore.signal = gen8_xcs_signal;
@@ -3068,8 +3064,6 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) } }else { engine->irq_enable_mask =GT_BSD_USER_INTERRUPT ; - engine->dispatch_execbuffer = - gen6_ring_dispatch_execbuffer;if (i915_semaphore_is_enabled (dev_priv)) { engine->semaphore.sync_to = gen6_ring_sync; engine->semaphore.signal = gen6_signal;
@@ -3093,7 +3087,6 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) }else { engine->irq_enable_mask =I915_BSD_USER_INTERRUPT ; } - engine->dispatch_execbuffer = i965_dispatch_execbuffer; }return intel_init_ring_buffer (dev, engine);
@@ -3118,8 +3111,6 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev) engine->flush = gen6_bsd_ring_flush; engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT <<GEN8_VCS2_IRQ_SHIFT ; - engine->dispatch_execbuffer = - gen8_ring_dispatch_execbuffer;if (i915_semaphore_is_enabled (dev_priv)) { engine->semaphore.sync_to = gen8_ring_sync; engine->semaphore.signal = gen8_xcs_signal;
@@ -3146,7 +3137,6 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)if (INTEL_GEN (dev_priv) >=8 ) { engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT <<GEN8_BCS_IRQ_SHIFT ; - engine->dispatch_execbuffer = gen8_ring_dispatch_execbuffer;if (i915_semaphore_is_enabled (dev_priv)) { engine->semaphore.sync_to = gen8_ring_sync; engine->semaphore.signal = gen8_xcs_signal;
@@ -3154,7 +3144,6 @@ int intel_init_blt_ring_buffer(struct drm_device *dev) } }else { engine->irq_enable_mask =GT_BLT_USER_INTERRUPT ; - engine->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;if (i915_semaphore_is_enabled (dev_priv)) { engine->semaphore.signal = gen6_signal; engine->semaphore.sync_to = gen6_ring_sync;
@@ -3199,7 +3188,6 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev)if (INTEL_GEN (dev_priv) >=8 ) { engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT <<GEN8_VECS_IRQ_SHIFT ; - engine->dispatch_execbuffer = gen8_ring_dispatch_execbuffer;if (i915_semaphore_is_enabled (dev_priv)) { engine->semaphore.sync_to = gen8_ring_sync; engine->semaphore.signal = gen8_xcs_signal;
@@ -3209,7 +3197,6 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev) engine->irq_enable_mask =PM_VEBOX_USER_INTERRUPT ; engine->irq_get = hsw_vebox_get_irq; engine->irq_put = hsw_vebox_put_irq; - engine->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;if (i915_semaphore_is_enabled (dev_priv)) { engine->semaphore.sync_to = gen6_ring_sync; engine->semaphore.signal = gen6_signal;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 07/13] drm/i915: Consolidate dispatch_execbuffer vfunc
Quoted 12 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Signed-off-by Tvrtko Ursulin <[email protected]>--- drivers/gpu/drm/i915/intel_ringbuffer.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0
drivers/gpu/drm/i915/intel_ringbuffer.c static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv, · line 2889
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +4
-1@@ -2881,11 +2881,15 @@ static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv, engine->get_seqno = ring_get_seqno; engine->set_seqno = ring_set_seqno; -if (INTEL_GEN (dev_priv) >=6 ) { +if (INTEL_GEN (dev_priv) >=8 ) { + engine->dispatch_execbuffer = gen8_ring_dispatch_execbuffer; + }else if (INTEL_GEN (dev_priv) >=6 ) { engine->add_request = gen6_add_request; engine->irq_seqno_barrier = gen6_seqno_barrier; + engine->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;
Dispatch comes before add_request! A little bit of ocd to try and have the order in the code match the order in which they are used. -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
PATCH 8/13 drm/i915: Consolidate semaphore vfuncs init
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 48 +++++++++++++-------------------- 1 file changed, 18 insertions(+), 30 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +18 -30
@@ -2873,6 +2873,22 @@ static int gen6_ring_flush(struct drm_i915_gem_request *req,return 0 ; } +static void intel_ring_init_semaphores (struct drm_i915_private *dev_priv, +struct intel_engine_cs *engine) +{ +if (!i915_semaphore_is_enabled (dev_priv)) +return ; + +if (INTEL_GEN (dev_priv) >=8 ) { + engine->semaphore.sync_to = gen8_ring_sync; + engine->semaphore.signal = gen8_xcs_signal; +GEN8_RING_SEMAPHORE_INIT (engine); + }else if (INTEL_GEN (dev_priv) >=6 ) { + engine->semaphore.sync_to = gen6_ring_sync; + engine->semaphore.signal = gen6_signal; + } +} +static void intel_ring_default_vfuncs (struct drm_i915_private *dev_priv,struct intel_engine_cs *engine) {
@@ -2908,6 +2924,8 @@ static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv, engine->irq_get = i8xx_ring_get_irq; engine->irq_put = i8xx_ring_put_irq; } + +intel_ring_init_semaphores (dev_priv, engine); }int intel_init_render_ring_buffer (struct drm_device *dev)
@@ -2949,9 +2967,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev) engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT ;if (i915_semaphore_is_enabled (dev_priv)) {WARN_ON (!dev_priv->semaphore_obj); - engine->semaphore.sync_to = gen8_ring_sync; engine->semaphore.signal = gen8_rcs_signal; -GEN8_RING_SEMAPHORE_INIT (engine); } }else if (INTEL_GEN (dev_priv) >=6 ) { engine->init_context = intel_rcs_ctx_init;
@@ -2960,8 +2976,6 @@ int intel_init_render_ring_buffer(struct drm_device *dev) engine->flush = gen6_render_ring_flush; engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT ;if (i915_semaphore_is_enabled (dev_priv)) { - engine->semaphore.sync_to = gen6_ring_sync; - engine->semaphore.signal = gen6_signal;/* * The current semaphore is only applied on pre-gen8 * platform. And there is no VCS2 ring on the pre-gen8
@@ -3057,16 +3071,9 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)if (INTEL_GEN (dev_priv) >=8 ) { engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT ; -if (i915_semaphore_is_enabled (dev_priv)) { - engine->semaphore.sync_to = gen8_ring_sync; - engine->semaphore.signal = gen8_xcs_signal; -GEN8_RING_SEMAPHORE_INIT (engine); - } }else { engine->irq_enable_mask =GT_BSD_USER_INTERRUPT ;if (i915_semaphore_is_enabled (dev_priv)) { - engine->semaphore.sync_to = gen6_ring_sync; - engine->semaphore.signal = gen6_signal; engine->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_VR ; engine->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_INVALID ; engine->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_VB ;
@@ -3111,11 +3118,6 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev) engine->flush = gen6_bsd_ring_flush; engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT <<GEN8_VCS2_IRQ_SHIFT ; -if (i915_semaphore_is_enabled (dev_priv)) { - engine->semaphore.sync_to = gen8_ring_sync; - engine->semaphore.signal = gen8_xcs_signal; -GEN8_RING_SEMAPHORE_INIT (engine); - }return intel_init_ring_buffer (dev, engine); }
@@ -3137,16 +3139,9 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)if (INTEL_GEN (dev_priv) >=8 ) { engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT <<GEN8_BCS_IRQ_SHIFT ; -if (i915_semaphore_is_enabled (dev_priv)) { - engine->semaphore.sync_to = gen8_ring_sync; - engine->semaphore.signal = gen8_xcs_signal; -GEN8_RING_SEMAPHORE_INIT (engine); - } }else { engine->irq_enable_mask =GT_BLT_USER_INTERRUPT ;if (i915_semaphore_is_enabled (dev_priv)) { - engine->semaphore.signal = gen6_signal; - engine->semaphore.sync_to = gen6_ring_sync;/* * The current semaphore is only applied on pre-gen8 * platform. And there is no VCS2 ring on the pre-gen8
@@ -3188,18 +3183,11 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev)if (INTEL_GEN (dev_priv) >=8 ) { engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT <<GEN8_VECS_IRQ_SHIFT ; -if (i915_semaphore_is_enabled (dev_priv)) { - engine->semaphore.sync_to = gen8_ring_sync; - engine->semaphore.signal = gen8_xcs_signal; -GEN8_RING_SEMAPHORE_INIT (engine); - } }else { engine->irq_enable_mask =PM_VEBOX_USER_INTERRUPT ; engine->irq_get = hsw_vebox_get_irq; engine->irq_put = hsw_vebox_put_irq;if (i915_semaphore_is_enabled (dev_priv)) { - engine->semaphore.sync_to = gen6_ring_sync; - engine->semaphore.signal = gen6_signal; engine->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_VER ; engine->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_VEV ; engine->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_VEB ;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/13 drm/i915: Compact Gen8 semaphore initialization
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Replace the macro initializer with a programatic loop which results in smaller code and hopefully just as clear.
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 16 +++++++++++++++- drivers/gpu/drm/i915/intel_ringbuffer.h | 12 ------------ 2 files changed, 15 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +15 -1
@@ -2876,13 +2876,27 @@ static int gen6_ring_flush(struct drm_i915_gem_request *req,static void intel_ring_init_semaphores (struct drm_i915_private *dev_priv,struct intel_engine_cs *engine) { +int i; +if (!i915_semaphore_is_enabled (dev_priv))return ;if (INTEL_GEN (dev_priv) >=8 ) { engine->semaphore.sync_to = gen8_ring_sync; engine->semaphore.signal = gen8_xcs_signal; -GEN8_RING_SEMAPHORE_INIT (engine); + +if (dev_priv->semaphore_obj) { +u64 offset =i915_gem_obj_ggtt_offset (dev_priv->semaphore_obj); + +for (i =0 ; i <I915_NUM_ENGINES ; i++) { +u64 ring_offset =MI_SEMAPHORE_SYNC_INVALID ; + +if (i != engine->id) + ring_offset = offset +GEN8_SEMAPHORE_OFFSET (engine->id, i); + + engine->semaphore.signal_ggtt[i] = ring_offset; + } + } }else if (INTEL_GEN (dev_priv) >=6 ) { engine->semaphore.sync_to = gen6_ring_sync; engine->semaphore.signal = gen6_signal;
drivers/gpu/drm/i915/intel_ringbuffer.h +0 -12
@@ -62,18 +62,6 @@ struct intel_hw_status_page { (i915_gem_obj_ggtt_offset (dev_priv->semaphore_obj) + \ GEN8_SEMAPHORE_OFFSET(from, (__ring)->id)) -#define GEN8_RING_SEMAPHORE_INIT (e) do { \ - if (!dev_priv->semaphore_obj) { \ - break; \ - } \ - (e)->semaphore.signal_ggtt[RCS] = GEN8_SIGNAL_OFFSET((e), RCS); \ - (e)->semaphore.signal_ggtt[VCS] = GEN8_SIGNAL_OFFSET((e), VCS); \ - (e)->semaphore.signal_ggtt[BCS] = GEN8_SIGNAL_OFFSET((e), BCS); \ - (e)->semaphore.signal_ggtt[VECS] = GEN8_SIGNAL_OFFSET((e), VECS); \ - (e)->semaphore.signal_ggtt[VCS2] = GEN8_SIGNAL_OFFSET((e), VCS2); \ - (e)->semaphore.signal_ggtt[(e)->id] = MI_SEMAPHORE_SYNC_INVALID; \ - } while(0) -enum intel_ring_hangcheck_action {HANGCHECK_IDLE =0 ,HANGCHECK_WAIT ,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 09/13] drm/i915: Compact Gen8 semaphore initialization
Quoted 20 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Replace the macro initializer with a programatic loop which results in smaller code and hopefully just as clear.
Signed-off-by Tvrtko Ursulin <[email protected]>--- drivers/gpu/drm/i915/intel_ringbuffer.c | 16 +++++++++++++++- drivers/gpu/drm/i915/intel_ringbuffer.h | 12 ------------ 2 files changed, 15 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/intel_ringbuffer.c +1
-0@@ -2876,13 +2876,27 @@ static int gen6_ring_flush(struct drm_i915_gem_request *req,static void intel_ring_init_semaphores (struct drm_i915_private *dev_priv,struct intel_engine_cs *engine) { +int i;
drivers/gpu/drm/i915/intel_ringbuffer.c static int gen6_ring_flush(struct drm_i915_gem_request *req, · line 2888
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +3
-1+if (!i915_semaphore_is_enabled (dev_priv))return ;if (INTEL_GEN (dev_priv) >=8 ) { engine->semaphore.sync_to = gen8_ring_sync; engine->semaphore.signal = gen8_xcs_signal; -GEN8_RING_SEMAPHORE_INIT (engine); + +if (dev_priv->semaphore_obj) {
Something is broken if we reach here without semaphore_obj and semaphores enabled.
Hmm. Currently we create the semaphore_obj before creating initialising the semaphore vfuncs on the render ring. Don't you need to do the same here?
intel_ring_init_seamphores() {
if (!semaphores_is_enabled(dev_priv))
return;
if (INTEL_GEN(dev_priv) >= 8 && !dev_priv->semaphore_obj) {
semaphore_obj = i915_gem_object_create()
if (!semaphore_obj)
i915.enable_semaphores = 0;
return;
}
if (INTEL_GEN(dev_priv) >= 8) {
} else { /* semaphores_is_enabled() should not be true for < 6 */
}-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
PATCH 10/13 drm/i915: Compact gen8_ring_sync
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Store the semaphore offset in a temporary variable to avoid having to get the VMA offset twice.
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +3 -4
@@ -1542,6 +1542,7 @@ gen8_ring_sync(struct drm_i915_gem_request *waiter_req, {struct intel_engine_cs *waiter = waiter_req->engine;struct drm_i915_private *dev_priv = waiter_req->i915; +u64 offset =GEN8_WAIT_OFFSET (waiter, signaller->id);struct i915_hw_ppgtt *ppgtt;int ret;
@@ -1553,10 +1554,8 @@ gen8_ring_sync(struct drm_i915_gem_request *waiter_req,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_emit (waiter,lower_32_bits (offset)); +intel_ring_emit (waiter,upper_32_bits (offset));intel_ring_advance (waiter);/* When the !RCS engines idle waiting upon a semaphore, they lose their
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 11/13 drm/i915: Consolidate legacy semaphore initialization
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Replace per-engine initialization with a common half-programatic, half-data driven code for ease of maintenance and compactness.
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 110 ++++++++++++++------------------ 1 file changed, 48 insertions(+), 62 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +48 -62
@@ -2899,6 +2899,54 @@ static void intel_ring_init_semaphores(struct drm_i915_private *dev_priv, }else if (INTEL_GEN (dev_priv) >=6 ) { engine->semaphore.sync_to = gen6_ring_sync; engine->semaphore.signal = gen6_signal; + +/* +* The current semaphore is only applied on pre-gen8 +* platform. And there is no VCS2 ring on the pre-gen8 +* platform. So the semaphore between RCS and VCS2 is +* initialized as INVALID. Gen8 will initialize the +* 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; + } } }
@@ -2988,25 +3036,6 @@ int intel_init_render_ring_buffer(struct drm_device *dev)if (IS_GEN6 (dev_priv)) engine->flush = gen6_render_ring_flush; engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT ; -if (i915_semaphore_is_enabled (dev_priv)) { -/* -* The current semaphore is only applied on pre-gen8 -* platform. And there is no VCS2 ring on the pre-gen8 -* platform. So the semaphore between RCS and VCS2 is -* initialized as INVALID. Gen8 will initialize the -* sema between VCS2 and RCS later. -*/ - engine->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_INVALID ; - engine->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_RV ; - engine->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_RB ; - engine->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_RVE ; - engine->semaphore.mbox.wait[VCS2 ] =MI_SEMAPHORE_SYNC_INVALID ; - engine->semaphore.mbox.signal[RCS ] =GEN6_NOSYNC ; - engine->semaphore.mbox.signal[VCS ] =GEN6_VRSYNC ; - engine->semaphore.mbox.signal[BCS ] =GEN6_BRSYNC ; - engine->semaphore.mbox.signal[VECS ] =GEN6_VERSYNC ; - engine->semaphore.mbox.signal[VCS2 ] =GEN6_NOSYNC ; - } }else if (IS_GEN5 (dev_priv)) { engine->add_request = pc_render_add_request; engine->flush = gen4_render_ring_flush;
@@ -3086,18 +3115,6 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)GT_RENDER_USER_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT ; }else { engine->irq_enable_mask =GT_BSD_USER_INTERRUPT ; -if (i915_semaphore_is_enabled (dev_priv)) { - engine->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_VR ; - engine->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_INVALID ; - engine->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_VB ; - engine->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_VVE ; - engine->semaphore.mbox.wait[VCS2 ] =MI_SEMAPHORE_SYNC_INVALID ; - engine->semaphore.mbox.signal[RCS ] =GEN6_RVSYNC ; - engine->semaphore.mbox.signal[VCS ] =GEN6_NOSYNC ; - engine->semaphore.mbox.signal[BCS ] =GEN6_BVSYNC ; - engine->semaphore.mbox.signal[VECS ] =GEN6_VEVSYNC ; - engine->semaphore.mbox.signal[VCS2 ] =GEN6_NOSYNC ; - } } }else { engine->mmio_base =BSD_RING_BASE ;
@@ -3154,25 +3171,6 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)GT_RENDER_USER_INTERRUPT <<GEN8_BCS_IRQ_SHIFT ; }else { engine->irq_enable_mask =GT_BLT_USER_INTERRUPT ; -if (i915_semaphore_is_enabled (dev_priv)) { -/* -* The current semaphore is only applied on pre-gen8 -* platform. And there is no VCS2 ring on the pre-gen8 -* platform. So the semaphore between BCS and VCS2 is -* initialized as INVALID. Gen8 will initialize the -* sema between BCS and VCS2 later. -*/ - engine->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_BR ; - engine->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_BV ; - engine->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_INVALID ; - engine->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_BVE ; - engine->semaphore.mbox.wait[VCS2 ] =MI_SEMAPHORE_SYNC_INVALID ; - engine->semaphore.mbox.signal[RCS ] =GEN6_RBSYNC ; - engine->semaphore.mbox.signal[VCS ] =GEN6_VBSYNC ; - engine->semaphore.mbox.signal[BCS ] =GEN6_NOSYNC ; - engine->semaphore.mbox.signal[VECS ] =GEN6_VEBSYNC ; - engine->semaphore.mbox.signal[VCS2 ] =GEN6_NOSYNC ; - } }return intel_init_ring_buffer (dev, engine);
@@ -3200,18 +3198,6 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev) engine->irq_enable_mask =PM_VEBOX_USER_INTERRUPT ; engine->irq_get = hsw_vebox_get_irq; engine->irq_put = hsw_vebox_put_irq; -if (i915_semaphore_is_enabled (dev_priv)) { - engine->semaphore.mbox.wait[RCS ] =MI_SEMAPHORE_SYNC_VER ; - engine->semaphore.mbox.wait[VCS ] =MI_SEMAPHORE_SYNC_VEV ; - engine->semaphore.mbox.wait[BCS ] =MI_SEMAPHORE_SYNC_VEB ; - engine->semaphore.mbox.wait[VECS ] =MI_SEMAPHORE_SYNC_INVALID ; - engine->semaphore.mbox.wait[VCS2 ] =MI_SEMAPHORE_SYNC_INVALID ; - engine->semaphore.mbox.signal[RCS ] =GEN6_RVESYNC ; - engine->semaphore.mbox.signal[VCS ] =GEN6_VVESYNC ; - engine->semaphore.mbox.signal[BCS ] =GEN6_BVESYNC ; - engine->semaphore.mbox.signal[VECS ] =GEN6_NOSYNC ; - engine->semaphore.mbox.signal[VCS2 ] =GEN6_NOSYNC ; - } }return intel_init_ring_buffer (dev, engine);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 12/13 drm/i915: Remove redundant warning and consolidate gen8 render semaphore vfunc
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Warning could not trigger due code just above it making sure the semaphores revert to disabled state if the object allocation has failed. Move the relevant vfunc on the success path for clarity as well.
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +3 -5
@@ -3017,8 +3017,10 @@ int intel_init_render_ring_buffer(struct drm_device *dev)drm_gem_object_unreference (&obj->base);DRM_ERROR ("Failed to pin semaphore bo. Disabling semaphores\n" ); i915.semaphores =0 ; - }else + }else { dev_priv->semaphore_obj = obj; + engine->semaphore.signal = gen8_rcs_signal; + } } }
@@ -3026,10 +3028,6 @@ int intel_init_render_ring_buffer(struct drm_device *dev) engine->add_request = gen8_render_add_request; engine->flush = gen8_render_ring_flush; engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT ; -if (i915_semaphore_is_enabled (dev_priv)) { -WARN_ON (!dev_priv->semaphore_obj); - engine->semaphore.signal = gen8_rcs_signal; - } }else if (INTEL_GEN (dev_priv) >=6 ) { engine->init_context = intel_rcs_ctx_init; engine->flush = gen7_render_ring_flush;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 13/13 drm/i915: Trim some if-else braces
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Just a bit of cleanup after the previous refactoring.
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +6 -9
@@ -3108,20 +3108,18 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)if (IS_GEN6 (dev_priv)) engine->write_tail = gen6_bsd_ring_write_tail; engine->flush = gen6_bsd_ring_flush; -if (INTEL_GEN (dev_priv) >=8 ) { +if (INTEL_GEN (dev_priv) >=8 ) engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT ; - }else { +else engine->irq_enable_mask =GT_BSD_USER_INTERRUPT ; - } }else { engine->mmio_base =BSD_RING_BASE ; engine->flush = bsd_ring_flush; -if (IS_GEN5 (dev_priv)) { +if (IS_GEN5 (dev_priv)) engine->irq_enable_mask =ILK_BSD_USER_INTERRUPT ; - }else { +else engine->irq_enable_mask =I915_BSD_USER_INTERRUPT ; - } }return intel_init_ring_buffer (dev, engine);
@@ -3164,12 +3162,11 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)intel_ring_default_vfuncs (dev_priv, engine); engine->flush = gen6_ring_flush; -if (INTEL_GEN (dev_priv) >=8 ) { +if (INTEL_GEN (dev_priv) >=8 ) engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT <<GEN8_BCS_IRQ_SHIFT ; - }else { +else engine->irq_enable_mask =GT_BLT_USER_INTERRUPT ; - }return intel_init_ring_buffer (dev, engine); }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Ro.CI.BAT: failure for Legacy engine initialization refactoring
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Legacy engine initialization refactoring
URL : https://patchwork.freedesktop.org/series/9191/
State : failure
== Summary ==
Series 9191v1 Legacy engine initialization refactoring
http://patchwork.freedesktop.org/api/1.0/series/9191/revisions/1/mbox
Test core_auth:
Subgroup basic-auth:
pass -> INCOMPLETE (ro-bdw-i7-5600u)
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
fail -> PASS (ro-bdw-i7-5557U)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-WARN (ro-bdw-i7-5557U)
Subgroup suspend-read-crc-pipe-b:
dmesg-warn -> SKIP (ro-bdw-i5-5250u)
Subgroup suspend-read-crc-pipe-c:
skip -> DMESG-WARN (ro-bdw-i5-5250u)fi-hsw-i7-4770k total:229 pass:194 dwarn:0 dfail:0 fail:2 skip:33 fi-skl-i5-6260u total:229 pass:202 dwarn:0 dfail:0 fail:2 skip:25 fi-skl-i7-6700k total:229 pass:188 dwarn:0 dfail:0 fail:2 skip:39 fi-snb-i7-2600 total:229 pass:174 dwarn:0 dfail:0 fail:2 skip:53 ro-bdw-i5-5250u total:229 pass:202 dwarn:2 dfail:1 fail:2 skip:22 ro-bdw-i7-5557U total:229 pass:205 dwarn:1 dfail:1 fail:2 skip:20 ro-bdw-i7-5600u total:1 pass:0 dwarn:0 dfail:0 fail:0 skip:0 ro-byt-n2820 total:229 pass:178 dwarn:0 dfail:1 fail:5 skip:45 ro-hsw-i3-4010u total:229 pass:195 dwarn:0 dfail:1 fail:2 skip:31 ro-hsw-i7-4770r total:229 pass:195 dwarn:0 dfail:1 fail:2 skip:31 ro-ilk-i7-620lm total:229 pass:155 dwarn:0 dfail:1 fail:3 skip:70 ro-ilk1-i5-650 total:224 pass:155 dwarn:0 dfail:1 fail:3 skip:65 ro-ivb-i7-3770 total:229 pass:186 dwarn:0 dfail:1 fail:2 skip:40 ro-ivb2-i7-3770 total:229 pass:190 dwarn:0 dfail:1 fail:2 skip:36 ro-skl3-i5-6260u total:229 pass:206 dwarn:1 dfail:1 fail:2 skip:19 ro-snb-i7-2620M total:229 pass:179 dwarn:0 dfail:1 fail:1 skip:48
Results at /archive/results/CI_IGT_test/RO_Patchwork_1313/
892ee30 drm-intel-nightly: 2016y-06m-27d-13h-05m-35s UTC integration manifest 7159c53 drm/i915: Trim some if-else braces
309834d drm/i915: Remove redundant warning and consolidate gen8 render semaphore vfunc 2756a7b drm/i915: Consolidate legacy semaphore initialization4a2213d3 drm/i915: Compact gen8_ring_sync
eabf2a1 drm/i915: Compact Gen8 semaphore initialization
e830048 drm/i915: Consolidate semaphore vfuncs init
5d980c1 drm/i915: Consolidate dispatch_execbuffer vfunc
4e783d2 drm/i915: Consolidate init_hw vfunc
e9f9ffa drm/i915: Consolidate get/set_seqno
fe358a2 drm/i915: Consolidate get and put irq vfuncs
d462d93 drm/i915: Consolidate seqno_barrier vfunc
2d95e83 drm/i915: Consolidate add_request vfunc
dacc406 drm/i915: Consolidate write_tail vfunc initializer
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 24 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Preparation step towards unifying what can be unified between legacy and execlist.
This series tries to simplify the engine initializers by moving some of the commonatility replicated between all of the engines into a shared helper function - the same approach as in
intel_lrc.c.Also tries to simplify the semaphore initialization by replacing some verbose code with either a completely programatical code (Gen8), or a combination of a data table and logic (Gen6+).
To be discussed if people see this as a worthwhile improvement. It does shrink both the source and generated binary (~2k), but more importantly makes the initializers easier to read and understand. Hopefully not only for me.
Next step of unification can be employing the same data-driven setup + per-engine constructor loop driven approach as recently has been implemented in
intel_lrc.c. I think Dave already has some patches for that. And then finally extracting commonality betweenintel_ringbuffer.candintel_lrc.cgets easier to spot and to do (and review).
Quoted 8 lines
Tvrtko Ursulin (13):
drm/i915: Consolidatewrite_tailvfunc initializer drm/i915: Consolidateadd_requestvfunc drm/i915: Consolidateseqno_barriervfunc drm/i915: Consolidate get and put irq vfuncs drm/i915: Consolidate get/set_seqno drm/i915: Consolidateinit_hwvfunc drm/i915: Consolidatedispatch_execbuffervfunc
Lgtm,
Quoted 4 lines
drm/i915: Consolidate semaphore vfuncs init drm/i915: Compact Gen8 semaphore initialization drm/i915: Compact
gen8_ring_sync
drm/i915: Consolidate legacy semaphore initialization
Not so sure, the code is definitely better, I don't think the ordering is quite right and you open the code up for some more polish. -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