Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca585b5d authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Rename and inline i915_gem_context_get() 



i915_gem_context_get() is a very simple wrapper around idr_find(), so
simple that it would be smaller to do the lookup inline. Also we use the
verb 'lookup' to return a pointer from a handle, freeing 'get' to imply
obtaining a reference to the context.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1464098023-3294-3-git-send-email-chris@chris-wilson.co.uk
parent 499f2697

drivers/gpu/drm/i915/i915_drv.h

+15 −2
Original line number Diff line number Diff line
@@ -3427,11 +3427,24 @@ void i915_gem_context_reset(struct drm_device *dev); 
int i915_gem_context_open(struct drm_device *dev, struct drm_file *file);

void i915_gem_context_close(struct drm_device *dev, struct drm_file *file);

int i915_switch_context(struct drm_i915_gem_request *req);

struct i915_gem_context *

i915_gem_context_get(struct drm_i915_file_private *file_priv, u32 id);

void i915_gem_context_free(struct kref *ctx_ref);

struct drm_i915_gem_object *

i915_gem_alloc_context_obj(struct drm_device *dev, size_t size);



static inline struct i915_gem_context *

i915_gem_context_lookup(struct drm_i915_file_private *file_priv, u32 id)

{

	struct i915_gem_context *ctx;



	lockdep_assert_held(&file_priv->dev_priv->dev->struct_mutex);



	ctx = idr_find(&file_priv->context_idr, id);

	if (!ctx)

		return ERR_PTR(-ENOENT);



	return ctx;

}



static inline void i915_gem_context_reference(struct i915_gem_context *ctx)

{

	kref_get(&ctx->ref);

drivers/gpu/drm/i915/i915_gem_context.c

+4 −18
Original line number Diff line number Diff line
@@ -506,20 +506,6 @@ void i915_gem_context_close(struct drm_device *dev, struct drm_file *file) 
	idr_destroy(&file_priv->context_idr);

}



struct i915_gem_context *

i915_gem_context_get(struct drm_i915_file_private *file_priv, u32 id)

{

	struct i915_gem_context *ctx;



	lockdep_assert_held(&file_priv->dev_priv->dev->struct_mutex);



	ctx = idr_find(&file_priv->context_idr, id);

	if (!ctx)

		return ERR_PTR(-ENOENT);



	return ctx;

}



static inline int

mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)

{
@@ -951,7 +937,7 @@ int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data, 
	if (ret)

		return ret;



	ctx = i915_gem_context_get(file_priv, args->ctx_id);

	ctx = i915_gem_context_lookup(file_priv, args->ctx_id);

	if (IS_ERR(ctx)) {

		mutex_unlock(&dev->struct_mutex);

		return PTR_ERR(ctx);
@@ -977,7 +963,7 @@ int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data, 
	if (ret)

		return ret;



	ctx = i915_gem_context_get(file_priv, args->ctx_id);

	ctx = i915_gem_context_lookup(file_priv, args->ctx_id);

	if (IS_ERR(ctx)) {

		mutex_unlock(&dev->struct_mutex);

		return PTR_ERR(ctx);
@@ -1020,7 +1006,7 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, 
	if (ret)

		return ret;



	ctx = i915_gem_context_get(file_priv, args->ctx_id);

	ctx = i915_gem_context_lookup(file_priv, args->ctx_id);

	if (IS_ERR(ctx)) {

		mutex_unlock(&dev->struct_mutex);

		return PTR_ERR(ctx);
@@ -1072,7 +1058,7 @@ int i915_gem_context_reset_stats_ioctl(struct drm_device *dev, 
	if (ret)

		return ret;



	ctx = i915_gem_context_get(file->driver_priv, args->ctx_id);

	ctx = i915_gem_context_lookup(file->driver_priv, args->ctx_id);

	if (IS_ERR(ctx)) {

		mutex_unlock(&dev->struct_mutex);

		return PTR_ERR(ctx);

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -1075,7 +1075,7 @@ i915_gem_validate_context(struct drm_device *dev, struct drm_file *file, 
	if (engine->id != RCS && ctx_id != DEFAULT_CONTEXT_HANDLE)

		return ERR_PTR(-EINVAL);



	ctx = i915_gem_context_get(file->driver_priv, ctx_id);

	ctx = i915_gem_context_lookup(file->driver_priv, ctx_id);

	if (IS_ERR(ctx))

		return ctx;