drm/i915: unify first-stage engine struct setup
Subsystems (2)
PATCH 1/7 drm/i915: unify first-stage engine struct setup
From: Dave Gordon <[email protected]>
intel_lrc.c has a table of "logical rings" (meaning engines), while intel_ringbuffer.c has separately open-coded initialisation for each engine. We can deduplicate this somewhat by using the same first-stage engine-setup function for both modes.
So here we expose the function that transfers information from the static table of (all) known engines to the dev_priv->engine array of engines available on this device (adjusting the names along the way) and then embed calls to it in both the LRC and the legacy-mode setup.
--- drivers/gpu/drm/i915/intel_lrc.c | 40 +++++++++++++++++++++------------ drivers/gpu/drm/i915/intel_ringbuffer.c | 40 +++++++++------------------------ drivers/gpu/drm/i915/intel_ringbuffer.h | 5 +++++ 3 files changed, 41 insertions(+), 44 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +26 -14
@@ -1978,8 +1978,9 @@ logical_ring_default_vfuncs(struct intel_engine_cs *engine) }static inline void -logical_ring_default_irqs (struct intel_engine_cs *engine,unsigned shift) +logical_ring_default_irqs (struct intel_engine_cs *engine) { +unsigned shift = engine->irq_shift; engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT << shift; engine->irq_keep_mask =GT_CONTEXT_SWITCH_INTERRUPT << shift; }
@@ -2083,14 +2084,14 @@ static int logical_render_ring_init(struct intel_engine_cs *engine)return ret; } -static const struct logical_ring_info { +static const struct engine_info {const char *name;unsigned exec_id;unsigned guc_id;u32 mmio_base;unsigned irq_shift;int (*init)(struct intel_engine_cs *engine); -} logical_rings[] = { +} intel_engines[] = { [RCS ] = { .name ="render ring" , .exec_id =I915_EXEC_RENDER ,
@@ -2133,20 +2134,31 @@ static const struct logical_ring_info { }, }; -static struct intel_engine_cs * -logical_ring_setup (struct drm_i915_private *dev_priv,enum intel_engine_id id) +struct intel_engine_cs * +intel_engine_setup (struct drm_i915_private *dev_priv, +enum intel_engine_id id) { -const struct logical_ring_info *info = &logical_rings[id]; +const struct engine_info *info = &intel_engines[id];struct intel_engine_cs *engine = &dev_priv->engine[id]; -enum forcewake_domains fw_domains; engine->id = id; + engine->i915 = dev_priv; engine->name = info->name; engine->exec_id = info->exec_id; - engine->guc_id = info->guc_id; + engine->hw_id = engine->guc_id = info->guc_id; engine->mmio_base = info->mmio_base; + engine->irq_shift = info->irq_shift; - engine->i915 = dev_priv; +return engine; +} + +static struct intel_engine_cs * +logical_ring_setup (struct drm_i915_private *dev_priv,enum intel_engine_id id) +{ +struct intel_engine_cs *engine; +enum forcewake_domains fw_domains; + + engine =intel_engine_setup (dev_priv, id);/* Intentionally left blank. */ engine->buffer =NULL ;
@@ -2176,7 +2188,7 @@ logical_ring_setup(struct drm_i915_private *dev_priv, enum intel_engine_id id)logical_ring_init_platform_invariants (engine);logical_ring_default_vfuncs (engine); -logical_ring_default_irqs (engine, info->irq_shift); +logical_ring_default_irqs (engine);intel_engine_init_hangcheck (engine);i915_gem_batch_pool_init (&dev_priv->drm, &engine->batch_pool);
@@ -2205,14 +2217,14 @@ int intel_logical_rings_init(struct drm_device *dev)WARN_ON (INTEL_INFO (dev_priv)->ring_mask &GENMASK (sizeof (mask) *BITS_PER_BYTE -1 ,I915_NUM_ENGINES )); -for (i =0 ; i <ARRAY_SIZE (logical_rings); i++) { +for (i =0 ; i <ARRAY_SIZE (intel_engines); i++) {if (!HAS_ENGINE (dev_priv, i))continue ; -if (!logical_rings[i].init) +if (!intel_engines[i].init)continue ; - ret = logical_rings[i].init (logical_ring_setup (dev_priv, i)); + ret = intel_engines[i].init (logical_ring_setup (dev_priv, i));if (ret) goto cleanup;
@@ -2220,7 +2232,7 @@ int intel_logical_rings_init(struct drm_device *dev) }/* -* Catch failures to update logical_rings table when the new engines +* Catch failures to update intel_engines table when the new engines * are added to the driver by a warning and disabling the forgotten * engines. */
drivers/gpu/drm/i915/intel_ringbuffer.c +10 -30
@@ -2839,14 +2839,10 @@ static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv,int intel_init_render_ring_buffer (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_engine_cs *engine = &dev_priv->engine[RCS ]; +struct intel_engine_cs *engine;int ret; - engine->name ="render ring" ; - engine->id =RCS ; - engine->exec_id =I915_EXEC_RENDER ; - engine->hw_id =0 ; - engine->mmio_base =RENDER_RING_BASE ; + engine =intel_engine_setup (dev_priv,RCS );intel_ring_default_vfuncs (dev_priv, engine);
@@ -2901,17 +2897,13 @@ int intel_init_render_ring_buffer(struct drm_device *dev)int intel_init_bsd_ring_buffer (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_engine_cs *engine = &dev_priv->engine[VCS ]; +struct intel_engine_cs *engine; - engine->name ="bsd ring" ; - engine->id =VCS ; - engine->exec_id =I915_EXEC_BSD ; - engine->hw_id =1 ; + engine =intel_engine_setup (dev_priv,VCS );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 */ if (IS_GEN6 (dev_priv)) engine->write_tail = gen6_bsd_ring_write_tail;
@@ -2939,13 +2931,9 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)int intel_init_bsd2_ring_buffer (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_engine_cs *engine = &dev_priv->engine[VCS2 ]; +struct intel_engine_cs *engine; - engine->name ="bsd2 ring" ; - engine->id =VCS2 ; - engine->exec_id =I915_EXEC_BSD ; - engine->hw_id =4 ; - engine->mmio_base =GEN8_BSD2_RING_BASE ; + engine =intel_engine_setup (dev_priv,VCS2 );intel_ring_default_vfuncs (dev_priv, engine);
@@ -2959,13 +2947,9 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev)int intel_init_blt_ring_buffer (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_engine_cs *engine = &dev_priv->engine[BCS ]; +struct intel_engine_cs *engine; - engine->name ="blitter ring" ; - engine->id =BCS ; - engine->exec_id =I915_EXEC_BLT ; - engine->hw_id =2 ; - engine->mmio_base =BLT_RING_BASE ; + engine =intel_engine_setup (dev_priv,BCS );intel_ring_default_vfuncs (dev_priv, engine);
@@ -2982,13 +2966,9 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)int intel_init_vebox_ring_buffer (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_engine_cs *engine = &dev_priv->engine[VECS ]; +struct intel_engine_cs *engine; - engine->name ="video enhancement ring" ; - engine->id =VECS ; - engine->exec_id =I915_EXEC_VEBOX ; - engine->hw_id =3 ; - engine->mmio_base =VEBOX_RING_BASE ; + engine =intel_engine_setup (dev_priv,VECS );intel_ring_default_vfuncs (dev_priv, engine);
drivers/gpu/drm/i915/intel_ringbuffer.h +5 -0
@@ -147,6 +147,7 @@ struct intel_engine_cs {unsigned int hw_id;unsigned int guc_id;/* XXX same as hw_id? */ u32 mmio_base; +unsigned int irq_shift;struct intel_ringbuffer *buffer;struct list_head buffers;
@@ -361,6 +362,10 @@ struct intel_engine_cs {u32 (*get_cmd_length_mask)(u32 cmd_header); }; +struct intel_engine_cs * +intel_engine_setup (struct drm_i915_private *dev_priv, +enum intel_engine_id id); +static inline bool intel_engine_initialized (const struct intel_engine_cs *engine) {
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/7 drm/i915: Prepare for engine init unification
From: Tvrtko Ursulin <[email protected]>
Move the execlist engine setup to vfuncs so that the engine init loop is clearly split into the mode agnostic and specific steps.
--- drivers/gpu/drm/i915/intel_lrc.c | 103 ++++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 49 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +54 -49
@@ -2003,6 +2003,46 @@ lrc_setup_hws(struct intel_engine_cs *engine,return 0 ; } +static void +logical_ring_setup (struct intel_engine_cs *engine) +{ +struct drm_i915_private *dev_priv = engine->i915; +enum forcewake_domains fw_domains; + +/* Intentionally left blank. */ + engine->buffer =NULL ; + + fw_domains =intel_uncore_forcewake_for_reg (dev_priv, +RING_ELSP (engine), +FW_REG_WRITE ); + + fw_domains |=intel_uncore_forcewake_for_reg (dev_priv, +RING_CONTEXT_STATUS_PTR (engine), +FW_REG_READ |FW_REG_WRITE ); + + fw_domains |=intel_uncore_forcewake_for_reg (dev_priv, +RING_CONTEXT_STATUS_BUF_BASE (engine), +FW_REG_READ ); + + engine->fw_domains = fw_domains; + +INIT_LIST_HEAD (&engine->active_list); +INIT_LIST_HEAD (&engine->request_list); +INIT_LIST_HEAD (&engine->buffers); +INIT_LIST_HEAD (&engine->execlist_queue); +spin_lock_init (&engine->execlist_lock); + +tasklet_init (&engine->irq_tasklet, + intel_lrc_irq_handler, (unsigned long )engine); + +logical_ring_init_platform_invariants (engine); +logical_ring_default_vfuncs (engine); +logical_ring_default_irqs (engine); + +intel_engine_init_hangcheck (engine); +i915_gem_batch_pool_init (&dev_priv->drm, &engine->batch_pool); +} +static int logical_ring_init (struct intel_engine_cs *engine) {
@@ -2048,6 +2088,8 @@ static int logical_render_ring_init(struct intel_engine_cs *engine)struct drm_i915_private *dev_priv = engine->i915;int ret; +logical_ring_setup (engine); +if (HAS_L3_DPF (dev_priv)) engine->irq_keep_mask |=GT_RENDER_L3_PARITY_ERROR_INTERRUPT ;
@@ -2084,6 +2126,13 @@ static int logical_render_ring_init(struct intel_engine_cs *engine)return ret; } +static int logical_xcs_ring_init (struct intel_engine_cs *engine) +{ +logical_ring_setup (engine); + +return logical_ring_init (engine); +} + static const struct engine_info { const char *name; unsigned exec_id;
@@ -2106,7 +2155,7 @@ static const struct engine_info { .guc_id = GUC_BLITTER_ENGINE, .mmio_base = BLT_RING_BASE, .irq_shift = GEN8_BCS_IRQ_SHIFT, - .init = logical_ring_init, + .init = logical_xcs_ring_init, }, [VCS] = { .name = "bsd ring",
@@ -2114,7 +2163,7 @@ static const struct engine_info { .guc_id = GUC_VIDEO_ENGINE, .mmio_base = GEN6_BSD_RING_BASE, .irq_shift = GEN8_VCS1_IRQ_SHIFT, - .init = logical_ring_init, + .init = logical_xcs_ring_init, }, [VCS2] = { .name = "bsd2 ring",
@@ -2122,7 +2171,7 @@ static const struct engine_info { .guc_id = GUC_VIDEO_ENGINE2, .mmio_base = GEN8_BSD2_RING_BASE, .irq_shift = GEN8_VCS2_IRQ_SHIFT, - .init = logical_ring_init, + .init = logical_xcs_ring_init, }, [VECS] = { .name = "video enhancement ring",
@@ -2130,7 +2179,7 @@ static const struct engine_info { .guc_id = GUC_VIDEOENHANCE_ENGINE, .mmio_base = VEBOX_RING_BASE, .irq_shift = GEN8_VECS_IRQ_SHIFT, - .init = logical_ring_init, + .init = logical_xcs_ring_init, }, };
@@ -2152,50 +2201,6 @@ intel_engine_setup(struct drm_i915_private *dev_priv,return engine; } -static struct intel_engine_cs * -logical_ring_setup (struct drm_i915_private *dev_priv,enum intel_engine_id id) -{ -struct intel_engine_cs *engine; -enum forcewake_domains fw_domains; - - engine =intel_engine_setup (dev_priv, id); - -/* Intentionally left blank. */ - engine->buffer =NULL ; - - fw_domains =intel_uncore_forcewake_for_reg (dev_priv, -RING_ELSP (engine), -FW_REG_WRITE ); - - fw_domains |=intel_uncore_forcewake_for_reg (dev_priv, -RING_CONTEXT_STATUS_PTR (engine), -FW_REG_READ |FW_REG_WRITE ); - - fw_domains |=intel_uncore_forcewake_for_reg (dev_priv, -RING_CONTEXT_STATUS_BUF_BASE (engine), -FW_REG_READ ); - - engine->fw_domains = fw_domains; - -INIT_LIST_HEAD (&engine->active_list); -INIT_LIST_HEAD (&engine->request_list); -INIT_LIST_HEAD (&engine->buffers); -INIT_LIST_HEAD (&engine->execlist_queue); -spin_lock_init (&engine->execlist_lock); - -tasklet_init (&engine->irq_tasklet, - intel_lrc_irq_handler, (unsigned long )engine); - -logical_ring_init_platform_invariants (engine); -logical_ring_default_vfuncs (engine); -logical_ring_default_irqs (engine); - -intel_engine_init_hangcheck (engine); -i915_gem_batch_pool_init (&dev_priv->drm, &engine->batch_pool); - -return engine; -} -/** * intel_logical_rings_init() - allocate, populate and init the Engine Command Streamers * @dev: DRM device.
@@ -2224,7 +2229,7 @@ int intel_logical_rings_init(struct drm_device *dev)if (!intel_engines[i].init)continue ; - ret = intel_engines[i].init (logical_ring_setup (dev_priv, i)); + ret = intel_engines[i].init (intel_engine_setup (dev_priv, i));if (ret) goto cleanup;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/7 drm/i915: Unify engine init loop
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
With the unified common engine setup done, and the execlist engine initialization loop clearly split into two phases, we can eliminate the separate legacy engine initialization code.
v2: Fix cleanup path for legacy.
v3: Rename constructors. (Chris Wilson)
--- drivers/gpu/drm/i915/i915_drv.h | 2 -- drivers/gpu/drm/i915/i915_gem.c | 51 +-------------------------------- drivers/gpu/drm/i915/intel_lrc.c | 45 ++++++++++++++++++----------- drivers/gpu/drm/i915/intel_lrc.h | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 45 ++++++++++------------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 10 +++---- 6 files changed, 50 insertions(+), 105 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -2
@@ -2016,7 +2016,6 @@ struct drm_i915_private {int (*execbuf_submit)(struct i915_execbuffer_params *params,struct drm_i915_gem_execbuffer2 *args,struct list_head *vmas); -int (*init_engines)(struct drm_device *dev);void (*cleanup_engine)(struct intel_engine_cs *engine);void (*stop_engine)(struct intel_engine_cs *engine);
@@ -3374,7 +3373,6 @@ static inline u32 i915_reset_count(struct i915_gpu_error *error)void i915_gem_reset (struct drm_device *dev);bool i915_gem_clflush_object (struct drm_i915_gem_object *obj,bool force);int __must_check i915_gem_init (struct drm_device *dev); -int i915_gem_init_engines (struct drm_device *dev);int __must_check i915_gem_init_hw (struct drm_device *dev);void i915_gem_init_swizzling (struct drm_device *dev);void i915_gem_cleanup_engines (struct drm_device *dev);
drivers/gpu/drm/i915/i915_gem.c +1 -50
73 lines not on this page · raw message
drivers/gpu/drm/i915/intel_lrc.c +28 -17
108 lines not on this page · raw message
drivers/gpu/drm/i915/intel_lrc.h +1 -1
@@ -67,7 +67,7 @@ int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *requestint intel_logical_ring_reserve_space (struct drm_i915_gem_request *request);void intel_logical_ring_stop (struct intel_engine_cs *engine);void intel_logical_ring_cleanup (struct intel_engine_cs *engine); -int intel_logical_rings_init (struct drm_device *dev); +int intel_engines_init (struct drm_device *dev);int logical_ring_flush_all_caches (struct drm_i915_gem_request *req);/**
drivers/gpu/drm/i915/intel_ringbuffer.c +15 -30
103 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +5 -5
@@ -484,11 +484,11 @@ int intel_ring_invalidate_all_caches(struct drm_i915_gem_request *req);int intel_init_pipe_control (struct intel_engine_cs *engine,int size);void intel_fini_pipe_control (struct intel_engine_cs *engine); -int intel_init_render_ring_buffer (struct drm_device *dev); -int intel_init_bsd_ring_buffer (struct drm_device *dev); -int intel_init_bsd2_ring_buffer (struct drm_device *dev); -int intel_init_blt_ring_buffer (struct drm_device *dev); -int intel_init_vebox_ring_buffer (struct drm_device *dev); +int intel_init_render_ring_buffer (struct intel_engine_cs *engine); +int intel_init_bsd_ring_buffer (struct intel_engine_cs *engine); +int intel_init_bsd2_ring_buffer (struct intel_engine_cs *engine); +int intel_init_blt_ring_buffer (struct intel_engine_cs *engine); +int intel_init_vebox_ring_buffer (struct intel_engine_cs *engine);u64 intel_ring_get_active_head (struct intel_engine_cs *engine);static inline u32 intel_engine_get_seqno (struct intel_engine_cs *engine)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/7 drm/i915: Make more use of the shared engine irq setup
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Use more of the shared engine setup data for legacy engine initialization. This time to simplify the irq initialization code.
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +5 -15
@@ -2790,6 +2790,8 @@ static void intel_ring_init_semaphores(struct drm_i915_private *dev_priv,static void intel_ring_init_irq (struct drm_i915_private *dev_priv,struct intel_engine_cs *engine) { + engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT << engine->irq_shift; +if (INTEL_GEN (dev_priv) >=8 ) { engine->irq_enable = gen8_irq_enable; engine->irq_disable = gen8_irq_disable;
@@ -2843,7 +2845,6 @@ int intel_init_render_ring_buffer(struct intel_engine_cs *engine)intel_ring_default_vfuncs (dev_priv, engine); - engine->irq_enable_mask =GT_RENDER_USER_INTERRUPT ;if (HAS_L3_DPF (dev_priv)) engine->irq_keep_mask =GT_RENDER_L3_PARITY_ERROR_INTERRUPT ;
@@ -2902,10 +2903,7 @@ int intel_init_bsd_ring_buffer(struct intel_engine_cs *engine)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 ) - engine->irq_enable_mask = -GT_RENDER_USER_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT ; -else +if (INTEL_GEN (dev_priv) <8 ) engine->irq_enable_mask =GT_BSD_USER_INTERRUPT ; }else { engine->mmio_base =BSD_RING_BASE ;
@@ -2929,8 +2927,6 @@ int intel_init_bsd2_ring_buffer(struct intel_engine_cs *engine)intel_ring_default_vfuncs (dev_priv, engine); engine->flush = gen6_bsd_ring_flush; - engine->irq_enable_mask = -GT_RENDER_USER_INTERRUPT <<GEN8_VCS2_IRQ_SHIFT ;return intel_init_ring_buffer (&dev_priv->drm, engine); }
@@ -2942,10 +2938,7 @@ int intel_init_blt_ring_buffer(struct intel_engine_cs *engine)intel_ring_default_vfuncs (dev_priv, engine); engine->flush = gen6_ring_flush; -if (INTEL_GEN (dev_priv) >=8 ) - engine->irq_enable_mask = -GT_RENDER_USER_INTERRUPT <<GEN8_BCS_IRQ_SHIFT ; -else +if (INTEL_GEN (dev_priv) <8 ) engine->irq_enable_mask =GT_BLT_USER_INTERRUPT ;return intel_init_ring_buffer (&dev_priv->drm, engine);
@@ -2959,10 +2952,7 @@ int intel_init_vebox_ring_buffer(struct intel_engine_cs *engine) engine->flush = gen6_ring_flush; -if (INTEL_GEN (dev_priv) >=8 ) { - engine->irq_enable_mask = -GT_RENDER_USER_INTERRUPT <<GEN8_VECS_IRQ_SHIFT ; - }else { +if (INTEL_GEN (dev_priv) <8 ) { engine->irq_enable_mask =PM_VEBOX_USER_INTERRUPT ; engine->irq_enable = hsw_vebox_irq_enable; engine->irq_disable = hsw_vebox_irq_disable;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/7 drm/i915: Simplify intel_init_ring_buffer prototype
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Engine contains dev_priv so need to pass it in.
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +8 -10
@@ -2168,21 +2168,19 @@ static void intel_ring_context_unpin(struct i915_gem_context *ctx,i915_gem_context_unreference (ctx); } -static int intel_init_ring_buffer (struct drm_device *dev, -struct intel_engine_cs *engine) +static int intel_init_ring_buffer (struct intel_engine_cs *engine) { -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = engine->i915;struct intel_ringbuffer *ringbuf;int ret;WARN_ON (engine->buffer); - engine->i915 = dev_priv;INIT_LIST_HEAD (&engine->active_list);INIT_LIST_HEAD (&engine->request_list);INIT_LIST_HEAD (&engine->execlist_queue);INIT_LIST_HEAD (&engine->buffers); -i915_gem_batch_pool_init (dev, &engine->batch_pool); +i915_gem_batch_pool_init (&dev_priv->drm, &engine->batch_pool);memset (engine->semaphore.sync_seqno,0 ,sizeof (engine->semaphore.sync_seqno));
@@ -2875,7 +2873,7 @@ int intel_init_render_ring_buffer(struct intel_engine_cs *engine) engine->init_hw = init_render_ring; engine->cleanup = render_ring_cleanup; - ret =intel_init_ring_buffer (&dev_priv->drm, engine); + ret =intel_init_ring_buffer (engine);if (ret)return ret;
@@ -2914,7 +2912,7 @@ int intel_init_bsd_ring_buffer(struct intel_engine_cs *engine) engine->irq_enable_mask =I915_BSD_USER_INTERRUPT ; } -return intel_init_ring_buffer (&dev_priv->drm, engine); +return intel_init_ring_buffer (engine); }/**
@@ -2928,7 +2926,7 @@ int intel_init_bsd2_ring_buffer(struct intel_engine_cs *engine) engine->flush = gen6_bsd_ring_flush; -return intel_init_ring_buffer (&dev_priv->drm, engine); +return intel_init_ring_buffer (engine); }int intel_init_blt_ring_buffer (struct intel_engine_cs *engine)
@@ -2941,7 +2939,7 @@ int intel_init_blt_ring_buffer(struct intel_engine_cs *engine)if (INTEL_GEN (dev_priv) <8 ) engine->irq_enable_mask =GT_BLT_USER_INTERRUPT ; -return intel_init_ring_buffer (&dev_priv->drm, engine); +return intel_init_ring_buffer (engine); }int intel_init_vebox_ring_buffer (struct intel_engine_cs *engine)
@@ -2958,7 +2956,7 @@ int intel_init_vebox_ring_buffer(struct intel_engine_cs *engine) engine->irq_disable = hsw_vebox_irq_disable; } -return intel_init_ring_buffer (&dev_priv->drm, engine); +return intel_init_ring_buffer (engine); }int
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/7 drm/i915: Move common engine setup into intel_engine_cs.c
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Common code deserves to be put in a separate file from legacy and execlists implementation for clarity and ease of maintenance.
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/intel_engine_cs.c | 162 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_lrc.c | 138 +-------------------------- drivers/gpu/drm/i915/intel_lrc.h | 3 + drivers/gpu/drm/i915/intel_ringbuffer.h | 4 - 5 files changed, 168 insertions(+), 140 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_engine_cs.c
drivers/gpu/drm/i915/Makefile +1 -0
@@ -40,6 +40,7 @@ i915-y += i915_cmd_parser.o \ i915_gpu_error.o \ i915_trace_points.o \ intel_breadcrumbs.o \ + intel_engine_cs.o \ intel_lrc.o \ intel_mocs.o \ intel_ringbuffer.o \
drivers/gpu/drm/i915/intel_engine_cs.c new file +162 -0
162 lines not on this page · raw message
drivers/gpu/drm/i915/intel_lrc.c +2 -136
156 lines not on this page · raw message
drivers/gpu/drm/i915/intel_lrc.h +3 -0
@@ -67,6 +67,9 @@ int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *requestint intel_logical_ring_reserve_space (struct drm_i915_gem_request *request);void intel_logical_ring_stop (struct intel_engine_cs *engine);void intel_logical_ring_cleanup (struct intel_engine_cs *engine); +int logical_render_ring_init (struct intel_engine_cs *engine); +int logical_xcs_ring_init (struct intel_engine_cs *engine); +int intel_engines_init (struct drm_device *dev);int logical_ring_flush_all_caches (struct drm_i915_gem_request *req);
drivers/gpu/drm/i915/intel_ringbuffer.h +0 -4
@@ -362,10 +362,6 @@ struct intel_engine_cs {u32 (*get_cmd_length_mask)(u32 cmd_header); }; -struct intel_engine_cs * -intel_engine_setup (struct drm_i915_private *dev_priv, -enum intel_engine_id id); -static inline bool intel_engine_initialized (const struct intel_engine_cs *engine) {
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 6/7] drm/i915: Move common engine setup into intel_engine_cs.c
drivers/gpu/drm/i915/intel_engine_cs.c line 146
Quoted 8 lines · Tvrtko Ursulin
drivers/gpu/drm/i915/intel_engine_cs.c new file +8
-0+/* +* Catch failures to update intel_engines table when the new engines +* are added to the driver by a warning and disabling the forgotten +* engines. +*/ +if (WARN_ON (mask !=INTEL_INFO (dev_priv)->ring_mask)) { +struct intel_device_info *info = + (struct intel_device_info *)&dev_priv->info;
I snuck in mkwrite_device_info(), so
if (WARN_ON(mask != INTEL_INFO(dev_priv)->ring_mask))
mkwrite_device_info(dev_priv)->ring_mask = mask;
-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
Re: [PATCH 6/7] drm/i915: Move common engine setup into intel_engine_cs.c
Quoted 12 lines · Chris Wilson
drivers/gpu/drm/i915/intel_engine_cs.c line 146
Quoted 8 lines · Tvrtko Ursulin
drivers/gpu/drm/i915/intel_engine_cs.c new file +8
-0+/* +* Catch failures to update intel_engines table when the new engines +* are added to the driver by a warning and disabling the forgotten +* engines. +*/ +if (WARN_ON (mask !=INTEL_INFO (dev_priv)->ring_mask)) { +struct intel_device_info *info = + (struct intel_device_info *)&dev_priv->info;I snuck in
mkwrite_device_info(), so
Quoted 2 lines
if (
WARN_ON(mask != INTEL_INFO(dev_priv)->ring_mask))mkwrite_device_info(dev_priv)->ring_mask = mask;
This part is just code movement, the block you quote exists before this series even!
Follow up patch to this series would be easiest then, or a solitary precursor if you insist. Dangers of code movement with edits huh? (94b4f3ba483ace6dd4a3f881e19cc18bdbafa6ef)
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 6/7] drm/i915: Move common engine setup into intel_engine_cs.c
Quoted 17 lines · Tvrtko Ursulin
Quoted 12 lines · Chris Wilson
drivers/gpu/drm/i915/intel_engine_cs.c line 146
Quoted 8 lines · Tvrtko Ursulin
drivers/gpu/drm/i915/intel_engine_cs.c new file +8
-0+/* +* Catch failures to update intel_engines table when the new engines +* are added to the driver by a warning and disabling the forgotten +* engines. +*/ +if (WARN_ON (mask !=INTEL_INFO (dev_priv)->ring_mask)) { +struct intel_device_info *info = + (struct intel_device_info *)&dev_priv->info;I snuck in
mkwrite_device_info(), soQuoted 2 lines
if (
WARN_ON(mask != INTEL_INFO(dev_priv)->ring_mask))mkwrite_device_info(dev_priv)->ring_mask = mask;
Quoted 6 lines
This part is just code movement, the block you quote exists before this series even!
Follow up patch to this series would be easiest then, or a solitary precursor if you insist. Dangers of code movement with edits huh? (
94b4f3ba483ace6dd4a3f881e19cc18bdbafa6ef)
I was also on a checkpatch witchhunt.
-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 7/7 drm/i915: Pull out some more common engine init code
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Created two common helpers for engine setup and engine init phases respectively to help with code sharing.
--- drivers/gpu/drm/i915/intel_engine_cs.c | 47 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_lrc.c | 17 +++--------- drivers/gpu/drm/i915/intel_ringbuffer.c | 18 +++---------- drivers/gpu/drm/i915/intel_ringbuffer.h | 3 +++ 4 files changed, 56 insertions(+), 29 deletions(-)
drivers/gpu/drm/i915/intel_engine_cs.c +47 -0
@@ -160,3 +160,50 @@ cleanup:return ret; } +void intel_engine_init_hangcheck (struct intel_engine_cs *engine) +{ +memset (&engine->hangcheck,0 ,sizeof (engine->hangcheck)); +} + +/** +* intel_engines_setup_common - setup engine state not requiring hw access +* @engine: Engine to setup. +* +* Initializes @engine@ structure members shared between legacy and execlists +* submission modes which do not require hardware access. +* +* Typically done early in the submission mode specific engine setup stage. +*/ +void intel_engine_setup_common (struct intel_engine_cs *engine) +{ +INIT_LIST_HEAD (&engine->active_list); +INIT_LIST_HEAD (&engine->request_list); +INIT_LIST_HEAD (&engine->buffers); +INIT_LIST_HEAD (&engine->execlist_queue); +spin_lock_init (&engine->execlist_lock); + +intel_engine_init_hangcheck (engine); +i915_gem_batch_pool_init (&engine->i915->drm, &engine->batch_pool); +} + +/** +* intel_engines_init_common - initialize cengine state which might require hw access +* @engine: Engine to initialize. +* +* Initializes @engine@ structure members shared between legacy and execlists +* submission modes which do require hardware access. +* +* Typcally done at later stages of submission mode specific engine setup. +* +* Returns zero on success or an error code on failure. +*/ +int intel_engine_init_common (struct intel_engine_cs *engine) +{ +int ret; + + ret =intel_engine_init_breadcrumbs (engine); +if (ret) +return ret; + +return i915_cmd_parser_init_ring (engine); +}
drivers/gpu/drm/i915/intel_lrc.c +3 -14
@@ -2009,6 +2009,8 @@ logical_ring_setup(struct intel_engine_cs *engine)struct drm_i915_private *dev_priv = engine->i915;enum forcewake_domains fw_domains; +intel_engine_setup_common (engine); +/* Intentionally left blank. */ engine->buffer =NULL ;
@@ -2026,21 +2028,12 @@ logical_ring_setup(struct intel_engine_cs *engine) engine->fw_domains = fw_domains; -INIT_LIST_HEAD (&engine->active_list); -INIT_LIST_HEAD (&engine->request_list); -INIT_LIST_HEAD (&engine->buffers); -INIT_LIST_HEAD (&engine->execlist_queue); -spin_lock_init (&engine->execlist_lock); -tasklet_init (&engine->irq_tasklet, intel_lrc_irq_handler, (unsigned long )engine);logical_ring_init_platform_invariants (engine);logical_ring_default_vfuncs (engine);logical_ring_default_irqs (engine); - -intel_engine_init_hangcheck (engine); -i915_gem_batch_pool_init (&dev_priv->drm, &engine->batch_pool); } static int
@@ -2049,11 +2042,7 @@ logical_ring_init(struct intel_engine_cs *engine)struct i915_gem_context *dctx = engine->i915->kernel_context;int ret; - ret =intel_engine_init_breadcrumbs (engine); -if (ret) - goto error; - - ret =i915_cmd_parser_init_ring (engine); + ret =intel_engine_init_common (engine);if (ret) goto error;
drivers/gpu/drm/i915/intel_ringbuffer.c +3 -15
@@ -549,11 +549,6 @@ static bool stop_ring(struct intel_engine_cs *engine)return (I915_READ_HEAD (engine) &HEAD_ADDR ) ==0 ; } -void intel_engine_init_hangcheck (struct intel_engine_cs *engine) -{ -memset (&engine->hangcheck,0 ,sizeof (engine->hangcheck)); -} -static int init_ring_common (struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv = engine->i915;
@@ -2176,15 +2171,12 @@ static int intel_init_ring_buffer(struct intel_engine_cs *engine)WARN_ON (engine->buffer); -INIT_LIST_HEAD (&engine->active_list); -INIT_LIST_HEAD (&engine->request_list); -INIT_LIST_HEAD (&engine->execlist_queue); -INIT_LIST_HEAD (&engine->buffers); -i915_gem_batch_pool_init (&dev_priv->drm, &engine->batch_pool); +intel_engine_setup_common (engine); +memset (engine->semaphore.sync_seqno,0 ,sizeof (engine->semaphore.sync_seqno)); - ret =intel_engine_init_breadcrumbs (engine); + ret =intel_engine_init_common (engine);if (ret) goto error;
@@ -2225,10 +2217,6 @@ static int intel_init_ring_buffer(struct intel_engine_cs *engine) goto error; } - ret =i915_cmd_parser_init_ring (engine); -if (ret) - goto error; -return 0 ; error:
drivers/gpu/drm/i915/intel_ringbuffer.h +3 -0
@@ -480,6 +480,9 @@ int intel_ring_invalidate_all_caches(struct drm_i915_gem_request *req);int intel_init_pipe_control (struct intel_engine_cs *engine,int size);void intel_fini_pipe_control (struct intel_engine_cs *engine); +void intel_engine_setup_common (struct intel_engine_cs *engine); +int intel_engine_init_common (struct intel_engine_cs *engine); +int intel_init_render_ring_buffer (struct intel_engine_cs *engine);int intel_init_bsd_ring_buffer (struct intel_engine_cs *engine);int intel_init_bsd2_ring_buffer (struct intel_engine_cs *engine);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Ro.CI.BAT: success for series starting with [1/7] drm/i915: unify first-stage engine struct setup
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: series starting with [1/7] drm/i915: unify first-stage engine struct setup
URL : https://patchwork.freedesktop.org/series/9821/
State : success
== Summary ==
Series 9821v1 Series without cover letter
http://patchwork.freedesktop.org/api/1.0/series/9821/revisions/1/mbox
Test prime_self_import:
Subgroup basic-llseek-size:
incomplete -> PASS (ro-byt-n2820)fi-kbl-qkkr total:237 pass:174 dwarn:25 dfail:4 fail:7 skip:27 fi-skl-i7-6700k total:237 pass:200 dwarn:2 dfail:0 fail:9 skip:26 fi-snb-i7-2600 total:237 pass:188 dwarn:0 dfail:0 fail:9 skip:40 ro-bdw-i5-5250u total:237 pass:210 dwarn:2 dfail:0 fail:9 skip:16 ro-bdw-i7-5557U total:237 pass:211 dwarn:1 dfail:0 fail:9 skip:16 ro-bdw-i7-5600u total:237 pass:195 dwarn:2 dfail:0 fail:9 skip:31 ro-bsw-n3050 total:217 pass:170 dwarn:0 dfail:0 fail:4 skip:42 ro-byt-n2820 total:237 pass:178 dwarn:0 dfail:0 fail:7 skip:38 ro-hsw-i3-4010u total:237 pass:199 dwarn:5 dfail:2 fail:7 skip:24 ro-hsw-i7-4770r total:237 pass:204 dwarn:0 dfail:0 fail:9 skip:24 ro-ilk-i7-620lm total:237 pass:166 dwarn:0 dfail:0 fail:8 skip:63 ro-ilk1-i5-650 total:232 pass:166 dwarn:0 dfail:0 fail:8 skip:58 ro-ivb-i7-3770 total:237 pass:197 dwarn:0 dfail:0 fail:7 skip:33 ro-skl3-i5-6260u total:237 pass:213 dwarn:3 dfail:0 fail:9 skip:12 ro-snb-i7-2620M total:237 pass:187 dwarn:0 dfail:0 fail:9 skip:41
Results at /archive/results/CI_IGT_test/RO_Patchwork_1486/
5cd2699 drm-intel-nightly: 2016y-07m-13d-14h-43m-27s UTC integration manifest f0b1666 drm/i915: Pull out some more common engine init code be8c237 drm/i915: Move common engine setup into intel_engine_cs.c a4cb7bc drm/i915: Simplify intel_init_ring_buffer prototype d3dfae1 drm/i915: Make more use of the shared engine irq setup ef59023 drm/i915: Unify engine init loop
ac58b8a drm/i915: Prepare for engine init unification
8120dcf drm/i915: unify first-stage engine struct setup
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
AppliedRe: ✓ Ro.CI.BAT: success for series starting with [1/7] drm/i915: unify first-stage engine struct setup
Quoted 33 lines · Patchwork
== Series Details ==
Series: series starting with [1/7] drm/i915: unify first-stage engine struct setup
URL : https://patchwork.freedesktop.org/series/9821/
State : success== Summary ==
Series 9821v1 Series without cover letter
http://patchwork.freedesktop.org/api/1.0/series/9821/revisions/1/mboxTest
prime_self_import:Subgroup basic-llseek-size: incomplete -> PASS (ro-byt-n2820)fi-kbl-qkkr total:237 pass:174 dwarn:25 dfail:4 fail:7 skip:27 fi-skl-i7-6700k total:237 pass:200 dwarn:2 dfail:0 fail:9 skip:26 fi-snb-i7-2600 total:237 pass:188 dwarn:0 dfail:0 fail:9 skip:40 ro-bdw-i5-5250u total:237 pass:210 dwarn:2 dfail:0 fail:9 skip:16 ro-bdw-i7-5557U total:237 pass:211 dwarn:1 dfail:0 fail:9 skip:16 ro-bdw-i7-5600u total:237 pass:195 dwarn:2 dfail:0 fail:9 skip:31 ro-bsw-n3050 total:217 pass:170 dwarn:0 dfail:0 fail:4 skip:42 ro-byt-n2820 total:237 pass:178 dwarn:0 dfail:0 fail:7 skip:38 ro-hsw-i3-4010u total:237 pass:199 dwarn:5 dfail:2 fail:7 skip:24 ro-hsw-i7-4770r total:237 pass:204 dwarn:0 dfail:0 fail:9 skip:24 ro-ilk-i7-620lm total:237 pass:166 dwarn:0 dfail:0 fail:8 skip:63 ro-ilk1-i5-650 total:232 pass:166 dwarn:0 dfail:0 fail:8 skip:58 ro-ivb-i7-3770 total:237 pass:197 dwarn:0 dfail:0 fail:7 skip:33 ro-skl3-i5-6260u total:237 pass:213 dwarn:3 dfail:0 fail:9 skip:12 ro-snb-i7-2620M total:237 pass:187 dwarn:0 dfail:0 fail:9 skip:41Results at /archive/results/CI_IGT_test/RO_Patchwork_1486/
Quoted 8 lines
5cd2699 drm-intel-nightly: 2016y-07m-13d-14h-43m-27s UTC integration manifest f0b1666 drm/i915: Pull out some more common engine init code be8c237 drm/i915: Move common engine setup into
intel_engine_cs.ca4cb7bc drm/i915: Simplifyintel_init_ring_bufferprototype d3dfae1 drm/i915: Make more use of the shared engine irq setup ef59023 drm/i915: Unify engine init loop
ac58b8a drm/i915: Prepare for engine init unification
8120dcf drm/i915: unify first-stage engine struct setup
Merged to dinq, thanks for the patches and review!
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Tvrtko Ursulin
From: Dave Gordon <[email protected]>
intel_lrc.chas a table of "logical rings" (meaning engines), whileintel_ringbuffer.chas separately open-coded initialisation for each engine. We can deduplicate this somewhat by using the same first-stage engine-setup function for both modes.
Quoted 6 lines
So here we expose the function that transfers information from the static table of (all) known engines to the
dev_priv->enginearray of engines available on this device (adjusting the names along the way) and then embed calls to it in both the LRC and the legacy-mode setup.Signed-off-by Dave Gordon <[email protected]>
LGTM, I didn't see anything that would impede applying this series, so
Reviewed-by: Chris Wilson <chris-wilson.co.uk>
(Goes off to double check...)
-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
Quoted 13 lines · Chris Wilson
Quoted 12 lines · Tvrtko Ursulin
From: Dave Gordon <[email protected]>
intel_lrc.chas a table of "logical rings" (meaning engines), whileintel_ringbuffer.chas separately open-coded initialisation for each engine. We can deduplicate this somewhat by using the same first-stage engine-setup function for both modes.So here we expose the function that transfers information from the static table of (all) known engines to the
dev_priv->enginearray of engines available on this device (adjusting the names along the way) and then embed calls to it in both the LRC and the legacy-mode setup.
Quoted 7 lines
Quoted 1 line
Signed-off-by Dave Gordon <[email protected]>LGTM, I didn't see anything that would impede applying this series, so
Reviewed-by: Chris Wilson <chris-wilson.co.uk>(Goes off to double check...)
R-b for the series or 1/7 ?
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 17 lines · Tvrtko Ursulin
Quoted 15 lines · Chris Wilson
Quoted 13 lines · Tvrtko Ursulin
From: Dave Gordon <[email protected]>
intel_lrc.chas a table of "logical rings" (meaning engines), whileintel_ringbuffer.chas separately open-coded initialisation for each engine. We can deduplicate this somewhat by using the same first-stage engine-setup function for both modes.So here we expose the function that transfers information from the static table of (all) known engines to the
dev_priv->enginearray of engines available on this device (adjusting the names along the way) and then embed calls to it in both the LRC and the legacy-mode setup.Signed-off-by Dave Gordon <[email protected]>
Quoted 7 lines
Quoted 5 lines
LGTM, I didn't see anything that would impede applying this series, so
Reviewed-by: Chris Wilson <chris-wilson.co.uk>(Goes off to double check...)
R-b for the series or 1/7 ?
Series, just a few more wishlist items for later.
-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