On pe, 2016-06-03 at 17:36 +0100, Chris Wilson wrote: > As these are wrappers around kref_get/kref_put() it is preferable to > follow the naming convention and use the same verb get/put in our > wrapper names for manipulating a reference to the context. > > Signed-off-by: Chris Wilson <[email protected]> > Cc: Tvrtko Ursulin <[email protected]> > Cc: Joonas Lahtinen <[email protected]>
Reviewed-by: Joonas Lahtinen <[email protected]> > --- > drivers/gpu/drm/i915/i915_drv.h | 6 ++++-- > drivers/gpu/drm/i915/i915_gem_context.c | 22 ++++++++++------------ > drivers/gpu/drm/i915/i915_gem_execbuffer.c | 6 +++--- > drivers/gpu/drm/i915/i915_gem_request.c | 7 +++---- > drivers/gpu/drm/i915/intel_lrc.c | 4 ++-- > drivers/gpu/drm/i915/intel_ringbuffer.c | 4 ++-- > 6 files changed, 24 insertions(+), 25 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 939cd45043c7..48d89b181246 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -3247,12 +3247,14 @@ i915_gem_context_lookup(struct drm_i915_file_private > *file_priv, u32 id) > return ctx; > } > > -static inline void i915_gem_context_reference(struct i915_gem_context *ctx) > +static inline struct i915_gem_context * > +i915_gem_context_get(struct i915_gem_context *ctx) > { > kref_get(&ctx->ref); > + return ctx; > } > > -static inline void i915_gem_context_unreference(struct i915_gem_context *ctx) > +static inline void i915_gem_context_put(struct i915_gem_context *ctx) > { > lockdep_assert_held(&ctx->i915->drm.struct_mutex); > kref_put(&ctx->ref, i915_gem_context_free); > diff --git a/drivers/gpu/drm/i915/i915_gem_context.c > b/drivers/gpu/drm/i915/i915_gem_context.c > index d01b3893eac0..b62862e31642 100644 > --- a/drivers/gpu/drm/i915/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/i915_gem_context.c > @@ -301,7 +301,7 @@ __create_hw_context(struct drm_device *dev, > return ctx; > > err_out: > - i915_gem_context_unreference(ctx); > + i915_gem_context_put(ctx); > return ERR_PTR(ret); > } > > @@ -329,7 +329,7 @@ i915_gem_create_context(struct drm_device *dev, > DRM_DEBUG_DRIVER("PPGTT setup failed (%ld)\n", > PTR_ERR(ppgtt)); > idr_remove(&file_priv->context_idr, ctx->user_handle); > - i915_gem_context_unreference(ctx); > + i915_gem_context_put(ctx); > return ERR_CAST(ppgtt); > } > > @@ -352,7 +352,7 @@ static void i915_gem_context_unpin(struct > i915_gem_context *ctx, > if (ce->state) > i915_gem_object_ggtt_unpin(ce->state); > > - i915_gem_context_unreference(ctx); > + i915_gem_context_put(ctx); > } > } > > @@ -466,7 +466,7 @@ void i915_gem_context_fini(struct drm_device *dev) > > lockdep_assert_held(&dev->struct_mutex); > > - i915_gem_context_unreference(dctx); > + i915_gem_context_put(dctx); > dev_priv->kernel_context = NULL; > > ida_destroy(&dev_priv->context_hw_ida); > @@ -477,7 +477,7 @@ static int context_idr_cleanup(int id, void *p, void > *data) > struct i915_gem_context *ctx = p; > > ctx->file_priv = ERR_PTR(-EBADF); > - i915_gem_context_unreference(ctx); > + i915_gem_context_put(ctx); > return 0; > } > > @@ -789,10 +789,9 @@ static int do_rcs_switch(struct drm_i915_gem_request > *req) > > /* obj is kept alive until the next request by its active ref */ > i915_gem_object_ggtt_unpin(from->engine[RCS].state); > - i915_gem_context_unreference(from); > + i915_gem_context_put(from); > } > - i915_gem_context_reference(to); > - engine->last_context = to; > + engine->last_context = i915_gem_context_get(to); > > /* GEN8 does *not* require an explicit reload if the PDPs have been > * setup, and we do not wish to move them. > @@ -876,10 +875,9 @@ int i915_switch_context(struct drm_i915_gem_request *req) > } > > if (to != engine->last_context) { > - i915_gem_context_reference(to); > if (engine->last_context) > - > i915_gem_context_unreference(engine->last_context); > - engine->last_context = to; > + i915_gem_context_put(engine->last_context); > + engine->last_context = i915_gem_context_get(to); > } > > return 0; > @@ -947,7 +945,7 @@ int i915_gem_context_destroy_ioctl(struct drm_device > *dev, void *data, > } > > idr_remove(&file_priv->context_idr, ctx->user_handle); > - i915_gem_context_unreference(ctx); > + i915_gem_context_put(ctx); > mutex_unlock(&dev->struct_mutex); > > DRM_DEBUG_DRIVER("HW context %d destroyed\n", args->ctx_id); > diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c > b/drivers/gpu/drm/i915/i915_gem_execbuffer.c > index d3297dab0298..7f441e74c903 100644 > --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c > +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c > @@ -1496,7 +1496,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void > *data, > goto pre_mutex_err; > } > > - i915_gem_context_reference(ctx); > + i915_gem_context_get(ctx); > > if (ctx->ppgtt) > vm = &ctx->ppgtt->base; > @@ -1507,7 +1507,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void > *data, > > eb = eb_create(args); > if (eb == NULL) { > - i915_gem_context_unreference(ctx); > + i915_gem_context_put(ctx); > mutex_unlock(&dev->struct_mutex); > ret = -ENOMEM; > goto pre_mutex_err; > @@ -1651,7 +1651,7 @@ err_batch_unpin: > > err: > /* the request owns the ref now */ > - i915_gem_context_unreference(ctx); > + i915_gem_context_put(ctx); > eb_destroy(eb); > > mutex_unlock(&dev->struct_mutex); > diff --git a/drivers/gpu/drm/i915/i915_gem_request.c > b/drivers/gpu/drm/i915/i915_gem_request.c > index 2ecaf9fa936a..987a43f1aac8 100644 > --- a/drivers/gpu/drm/i915/i915_gem_request.c > +++ b/drivers/gpu/drm/i915/i915_gem_request.c > @@ -243,8 +243,7 @@ __i915_gem_request_alloc(struct intel_engine_cs *engine, > req->i915 = dev_priv; > req->engine = engine; > req->reset_counter = reset_counter; > - req->ctx = ctx; > - i915_gem_context_reference(ctx); > + req->ctx = i915_gem_context_get(ctx); > > /* > * Reserve space in the ring buffer for all the commands required to > @@ -266,7 +265,7 @@ __i915_gem_request_alloc(struct intel_engine_cs *engine, > return 0; > > err_ctx: > - i915_gem_context_unreference(ctx); > + i915_gem_context_put(ctx); > err: > kmem_cache_free(dev_priv->requests, req); > return ret; > @@ -364,7 +363,7 @@ static void i915_gem_request_retire(struct > drm_i915_gem_request *request) > request->engine); > } > > - i915_gem_context_unreference(request->ctx); > + i915_gem_context_put(request->ctx); > i915_gem_request_put(request); > } > > diff --git a/drivers/gpu/drm/i915/intel_lrc.c > b/drivers/gpu/drm/i915/intel_lrc.c > index a25177016fb3..d55aa9ca2877 100644 > --- a/drivers/gpu/drm/i915/intel_lrc.c > +++ b/drivers/gpu/drm/i915/intel_lrc.c > @@ -961,7 +961,6 @@ static int intel_lr_context_pin(struct i915_gem_context > *ctx, > if (ret) > goto unpin_map; > > - i915_gem_context_reference(ctx); > ce->lrc_vma = i915_gem_obj_to_ggtt(ce->state); > intel_lr_context_descriptor_update(ctx, engine); > > @@ -973,6 +972,7 @@ static int intel_lr_context_pin(struct i915_gem_context > *ctx, > if (i915.enable_guc_submission) > I915_WRITE(GEN8_GTCR, GEN8_GTCR_INVALIDATE); > > + i915_gem_context_get(ctx); > return 0; > > unpin_map: > @@ -1004,7 +1004,7 @@ void intel_lr_context_unpin(struct i915_gem_context > *ctx, > ce->lrc_desc = 0; > ce->lrc_reg_state = NULL; > > - i915_gem_context_unreference(ctx); > + i915_gem_context_put(ctx); > } > > static int intel_logical_ring_workarounds_emit(struct drm_i915_gem_request > *req) > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c > b/drivers/gpu/drm/i915/intel_ringbuffer.c > index c3d6345aa2c1..e6a2e4973a01 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > @@ -2058,7 +2058,7 @@ static int intel_ring_context_pin(struct > i915_gem_context *ctx, > if (ctx == ctx->i915->kernel_context) > ce->initialised = true; > > - i915_gem_context_reference(ctx); > + i915_gem_context_get(ctx); > return 0; > > error: > @@ -2079,7 +2079,7 @@ static void intel_ring_context_unpin(struct > i915_gem_context *ctx, > if (ce->state) > i915_gem_object_ggtt_unpin(ce->state); > > - i915_gem_context_unreference(ctx); > + i915_gem_context_put(ctx); > } > > static int intel_init_ring_buffer(struct drm_device *dev, -- Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
