| Message ID | 1467391635-9902-1-git-send-email-tvrtko.ursulin@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jul 01, 2016 at 05:47:11PM +0100, Tvrtko Ursulin wrote: > From: Dave Gordon <david.s.gordon@intel.com> > > 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. > > Signed-off-by: Dave Gordon <david.s.gordon@intel.com> > --- > 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(-) > > diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c > index 339d8041075f..ed017f1a07a2 100644 > --- a/drivers/gpu/drm/i915/intel_lrc.c > +++ b/drivers/gpu/drm/i915/intel_lrc.c > @@ -1994,8 +1994,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; > init_waitqueue_head(&engine->irq_queue); > @@ -2096,14 +2097,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, > @@ -2146,20 +2147,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) Kerneldoc for this would be nice. Also, we now have a mess between intel_lrc.c and intel_ringbuffer.c. Extracting intel_engine.c with the shared bits or something similar, plus cleanup up all the docs would be awesome as a follow up. With the kerneldoc added: Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > { > - 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; Optional bikeshed: s/info->guc_id/info->hw_id/ makes sense imo in the new context. Or nuking engine->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; > @@ -2189,7 +2201,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->dev, &engine->batch_pool); > @@ -2218,14 +2230,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; > > @@ -2233,7 +2245,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. > */ > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c > index 24cdc920f4b4..215424efe05c 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > @@ -3036,15 +3036,11 @@ 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 = dev->dev_private; > - struct intel_engine_cs *engine = &dev_priv->engine[RCS]; > + struct intel_engine_cs *engine; > struct drm_i915_gem_object *obj; > 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); > > @@ -3117,17 +3113,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 = dev->dev_private; > - 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; > @@ -3155,13 +3147,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 = dev->dev_private; > - 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); > > @@ -3175,13 +3163,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 = dev->dev_private; > - 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); > > @@ -3198,13 +3182,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 = dev->dev_private; > - 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); > > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h > index 113d5230a6de..1aeb00cba9e2 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.h > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h > @@ -145,6 +145,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; > > @@ -335,6 +336,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(struct intel_engine_cs *engine) > { > -- > 1.9.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On 13/07/16 13:23, Daniel Vetter wrote: > On Fri, Jul 01, 2016 at 05:47:11PM +0100, Tvrtko Ursulin wrote: >> From: Dave Gordon <david.s.gordon@intel.com> >> >> 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. >> >> Signed-off-by: Dave Gordon <david.s.gordon@intel.com> >> --- >> 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(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c >> index 339d8041075f..ed017f1a07a2 100644 >> --- a/drivers/gpu/drm/i915/intel_lrc.c >> +++ b/drivers/gpu/drm/i915/intel_lrc.c >> @@ -1994,8 +1994,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; >> init_waitqueue_head(&engine->irq_queue); >> @@ -2096,14 +2097,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, >> @@ -2146,20 +2147,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) > > Kerneldoc for this would be nice. Also, we now have a mess between > intel_lrc.c and intel_ringbuffer.c. Extracting intel_engine.c with the Yes that was already suggested by Chris and I am trybotting the additions today, again on his explicit request to progress this series. > shared bits or something similar, plus cleanup up all the docs would be > awesome as a follow up. What do you mean "all the docs"? :D > > With the kerneldoc added: > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Thanks, will add. >> { >> - 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; > > Optional bikeshed: s/info->guc_id/info->hw_id/ makes sense imo in the new > context. Or nuking engine->guc_id. Someone said we cannot be sure they will be the same in the future. So maybe just rename to hw_id for now. Regards, Tvrtko
On 13/07/16 14:16, Tvrtko Ursulin wrote: > > On 13/07/16 13:23, Daniel Vetter wrote: >> On Fri, Jul 01, 2016 at 05:47:11PM +0100, Tvrtko Ursulin wrote: >>> From: Dave Gordon <david.s.gordon@intel.com> >>> >>> 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. >>> >>> Signed-off-by: Dave Gordon <david.s.gordon@intel.com> >>> --- >>> 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(-) >>> >>> diff --git a/drivers/gpu/drm/i915/intel_lrc.c >>> b/drivers/gpu/drm/i915/intel_lrc.c >>> index 339d8041075f..ed017f1a07a2 100644 >>> --- a/drivers/gpu/drm/i915/intel_lrc.c >>> +++ b/drivers/gpu/drm/i915/intel_lrc.c >>> @@ -1994,8 +1994,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; >>> init_waitqueue_head(&engine->irq_queue); >>> @@ -2096,14 +2097,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, >>> @@ -2146,20 +2147,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) >> >> Kerneldoc for this would be nice. Also, we now have a mess between >> intel_lrc.c and intel_ringbuffer.c. Extracting intel_engine.c with the > > Yes that was already suggested by Chris and I am trybotting the > additions today, again on his explicit request to progress this series. > >> shared bits or something similar, plus cleanup up all the docs would be >> awesome as a follow up. > > What do you mean "all the docs"? :D > >> >> With the kerneldoc added: >> >> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > Thanks, will add. Actually the function becomes static later in the series, when the common stuff is moved into intel_engine_cs.c. Can I keep the r-b without adding kernel doc for it then? Regards, Tvrtko
On 13/07/16 14:16, Tvrtko Ursulin wrote: > > On 13/07/16 13:23, Daniel Vetter wrote: >> On Fri, Jul 01, 2016 at 05:47:11PM +0100, Tvrtko Ursulin wrote: >>> From: Dave Gordon <david.s.gordon@intel.com> >>> [snip] >>> { >>> - 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; >> >> Optional bikeshed: s/info->guc_id/info->hw_id/ makes sense imo in the new >> context. Or nuking engine->guc_id. > > Someone said we cannot be sure they will be the same in the future. So > maybe just rename to hw_id for now. > > Regards, > Tvrtko The GuC firmware *could* use a completely different enumeration of the engines, but why would it? Since it's closely tied to the hardware, it *ought* to use the same naming scheme as the h/w. So I have no objection to getting rid of guc_id entirely, and changing existing uses to use hw_id instead. OTOH it seems little benefit and would certainly involve more work to reverse. The firmware team might, after all, decide that they too want to decouple the logical-engine-numbers used for the KMD interface from whatever the hardware team decide is the best way to number engines -- which might after all change between generations or even different SKUs of the same device! SO, I think the "best" version of that line is probably: + engine->hw_id = info->hw_id; + + /* Current GuC f/w uses hw_id not driver id */ + engine->guc_id = info->hw_id; and we'll add "info->guc_id" back again if it ever becomes necessary. .Dave.
On Wed, Jul 13, 2016 at 02:24:06PM +0100, Tvrtko Ursulin wrote: > > On 13/07/16 14:16, Tvrtko Ursulin wrote: > > > > On 13/07/16 13:23, Daniel Vetter wrote: > > > On Fri, Jul 01, 2016 at 05:47:11PM +0100, Tvrtko Ursulin wrote: > > > > From: Dave Gordon <david.s.gordon@intel.com> > > > > > > > > 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. > > > > > > > > Signed-off-by: Dave Gordon <david.s.gordon@intel.com> > > > > --- > > > > 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(-) > > > > > > > > diff --git a/drivers/gpu/drm/i915/intel_lrc.c > > > > b/drivers/gpu/drm/i915/intel_lrc.c > > > > index 339d8041075f..ed017f1a07a2 100644 > > > > --- a/drivers/gpu/drm/i915/intel_lrc.c > > > > +++ b/drivers/gpu/drm/i915/intel_lrc.c > > > > @@ -1994,8 +1994,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; > > > > init_waitqueue_head(&engine->irq_queue); > > > > @@ -2096,14 +2097,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, > > > > @@ -2146,20 +2147,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) > > > > > > Kerneldoc for this would be nice. Also, we now have a mess between > > > intel_lrc.c and intel_ringbuffer.c. Extracting intel_engine.c with the > > > > Yes that was already suggested by Chris and I am trybotting the > > additions today, again on his explicit request to progress this series. > > > > > shared bits or something similar, plus cleanup up all the docs would be > > > awesome as a follow up. > > > > What do you mean "all the docs"? :D > > > > > > > > With the kerneldoc added: > > > > > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > > > Thanks, will add. > > Actually the function becomes static later in the series, when the common > stuff is moved into intel_engine_cs.c. > > Can I keep the r-b without adding kernel doc for it then? Sure. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 339d8041075f..ed017f1a07a2 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1994,8 +1994,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; init_waitqueue_head(&engine->irq_queue); @@ -2096,14 +2097,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, @@ -2146,20 +2147,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; @@ -2189,7 +2201,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->dev, &engine->batch_pool); @@ -2218,14 +2230,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; @@ -2233,7 +2245,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. */ diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 24cdc920f4b4..215424efe05c 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -3036,15 +3036,11 @@ 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 = dev->dev_private; - struct intel_engine_cs *engine = &dev_priv->engine[RCS]; + struct intel_engine_cs *engine; struct drm_i915_gem_object *obj; 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); @@ -3117,17 +3113,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 = dev->dev_private; - 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; @@ -3155,13 +3147,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 = dev->dev_private; - 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); @@ -3175,13 +3163,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 = dev->dev_private; - 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); @@ -3198,13 +3182,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 = dev->dev_private; - 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); diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index 113d5230a6de..1aeb00cba9e2 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -145,6 +145,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; @@ -335,6 +336,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(struct intel_engine_cs *engine) {