| Message ID | 20190121222117.23305-8-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/34] drm/i915/execlists: Mark up priority boost on preemption | expand |
On Mon, 21 Jan 2019 at 23:41, Chris Wilson <chris@chris-wilson.co.uk> wrote: > > Prior to adding a third instance of intel_context_init() and extending > the information stored therewithin, refactor out the common assignments. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Chris Wilson <chris@chris-wilson.co.uk> writes: > Prior to adding a third instance of intel_context_init() and extending > the information stored therewithin, refactor out the common assignments. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > --- > drivers/gpu/drm/i915/i915_gem_context.c | 7 ++----- > drivers/gpu/drm/i915/i915_gem_context.h | 8 ++++++++ > drivers/gpu/drm/i915/selftests/mock_context.c | 7 ++----- > 3 files changed, 12 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c > index 5933adbe3d99..fae68c4c4683 100644 > --- a/drivers/gpu/drm/i915/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/i915_gem_context.c > @@ -338,11 +338,8 @@ __create_hw_context(struct drm_i915_private *dev_priv, > ctx->i915 = dev_priv; > ctx->sched.priority = I915_USER_PRIORITY(I915_PRIORITY_NORMAL); > > - for (n = 0; n < ARRAY_SIZE(ctx->__engine); n++) { > - struct intel_context *ce = &ctx->__engine[n]; > - > - ce->gem_context = ctx; > - } > + for (n = 0; n < ARRAY_SIZE(ctx->__engine); n++) > + intel_context_init(&ctx->__engine[n], ctx, dev_priv->engine[n]); > > INIT_RADIX_TREE(&ctx->handles_vma, GFP_KERNEL); > INIT_LIST_HEAD(&ctx->handles_list); > diff --git a/drivers/gpu/drm/i915/i915_gem_context.h b/drivers/gpu/drm/i915/i915_gem_context.h > index f6d870b1f73e..47d82ce7ba6a 100644 > --- a/drivers/gpu/drm/i915/i915_gem_context.h > +++ b/drivers/gpu/drm/i915/i915_gem_context.h > @@ -364,4 +364,12 @@ static inline void i915_gem_context_put(struct i915_gem_context *ctx) > kref_put(&ctx->ref, i915_gem_context_release); > } > > +static inline void > +intel_context_init(struct intel_context *ce, > + struct i915_gem_context *ctx, > + struct intel_engine_cs *engine) > +{ > + ce->gem_context = ctx; > +} > + Audience was also waiting intel_context_init_engines() Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> > #endif /* !__I915_GEM_CONTEXT_H__ */ > diff --git a/drivers/gpu/drm/i915/selftests/mock_context.c b/drivers/gpu/drm/i915/selftests/mock_context.c > index d937bdff26f9..b646cdcdd602 100644 > --- a/drivers/gpu/drm/i915/selftests/mock_context.c > +++ b/drivers/gpu/drm/i915/selftests/mock_context.c > @@ -45,11 +45,8 @@ mock_context(struct drm_i915_private *i915, > INIT_LIST_HEAD(&ctx->handles_list); > INIT_LIST_HEAD(&ctx->hw_id_link); > > - for (n = 0; n < ARRAY_SIZE(ctx->__engine); n++) { > - struct intel_context *ce = &ctx->__engine[n]; > - > - ce->gem_context = ctx; > - } > + for (n = 0; n < ARRAY_SIZE(ctx->__engine); n++) > + intel_context_init(&ctx->__engine[n], ctx, i915->engine[n]); > > ret = i915_gem_context_pin_hw_id(ctx); > if (ret < 0) > -- > 2.20.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Mika Kuoppala (2019-01-22 12:39:08) > Chris Wilson <chris@chris-wilson.co.uk> writes: > > +static inline void > > +intel_context_init(struct intel_context *ce, > > + struct i915_gem_context *ctx, > > + struct intel_engine_cs *engine) > > +{ > > + ce->gem_context = ctx; > > +} > > + > > Audience was also waiting intel_context_init_engines() struct intel_context is the per-engine instance, and it's not actually guaranteed that there will be a contiguous set :) One should always skip to the end of the novel to find out it was the butler who did it. -Chris
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 5933adbe3d99..fae68c4c4683 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -338,11 +338,8 @@ __create_hw_context(struct drm_i915_private *dev_priv, ctx->i915 = dev_priv; ctx->sched.priority = I915_USER_PRIORITY(I915_PRIORITY_NORMAL); - for (n = 0; n < ARRAY_SIZE(ctx->__engine); n++) { - struct intel_context *ce = &ctx->__engine[n]; - - ce->gem_context = ctx; - } + for (n = 0; n < ARRAY_SIZE(ctx->__engine); n++) + intel_context_init(&ctx->__engine[n], ctx, dev_priv->engine[n]); INIT_RADIX_TREE(&ctx->handles_vma, GFP_KERNEL); INIT_LIST_HEAD(&ctx->handles_list); diff --git a/drivers/gpu/drm/i915/i915_gem_context.h b/drivers/gpu/drm/i915/i915_gem_context.h index f6d870b1f73e..47d82ce7ba6a 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.h +++ b/drivers/gpu/drm/i915/i915_gem_context.h @@ -364,4 +364,12 @@ static inline void i915_gem_context_put(struct i915_gem_context *ctx) kref_put(&ctx->ref, i915_gem_context_release); } +static inline void +intel_context_init(struct intel_context *ce, + struct i915_gem_context *ctx, + struct intel_engine_cs *engine) +{ + ce->gem_context = ctx; +} + #endif /* !__I915_GEM_CONTEXT_H__ */ diff --git a/drivers/gpu/drm/i915/selftests/mock_context.c b/drivers/gpu/drm/i915/selftests/mock_context.c index d937bdff26f9..b646cdcdd602 100644 --- a/drivers/gpu/drm/i915/selftests/mock_context.c +++ b/drivers/gpu/drm/i915/selftests/mock_context.c @@ -45,11 +45,8 @@ mock_context(struct drm_i915_private *i915, INIT_LIST_HEAD(&ctx->handles_list); INIT_LIST_HEAD(&ctx->hw_id_link); - for (n = 0; n < ARRAY_SIZE(ctx->__engine); n++) { - struct intel_context *ce = &ctx->__engine[n]; - - ce->gem_context = ctx; - } + for (n = 0; n < ARRAY_SIZE(ctx->__engine); n++) + intel_context_init(&ctx->__engine[n], ctx, i915->engine[n]); ret = i915_gem_context_pin_hw_id(ctx); if (ret < 0)
Prior to adding a third instance of intel_context_init() and extending the information stored therewithin, refactor out the common assignments. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/i915_gem_context.c | 7 ++----- drivers/gpu/drm/i915/i915_gem_context.h | 8 ++++++++ drivers/gpu/drm/i915/selftests/mock_context.c | 7 ++----- 3 files changed, 12 insertions(+), 10 deletions(-)