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

Commit 9a6feaf0 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Rename i915_gem_context_reference/unreference() 



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.

s/i915_gem_context_reference/i915_gem_context_get/
s/i915_gem_context_unreference/i915_gem_context_put/

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 avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1469005202-9659-3-git-send-email-chris@chris-wilson.co.uk
Link: http://patchwork.freedesktop.org/patch/msgid/1469017917-15134-2-git-send-email-chris@chris-wilson.co.uk
parent e8a261ea

drivers/gpu/drm/i915/i915_drv.h

+4 −2
Original line number Diff line number Diff line
@@ -3338,12 +3338,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);

drivers/gpu/drm/i915/i915_gem_context.c

+10 −12
Original line number Diff line number Diff line
@@ -305,7 +305,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);

}
@@ -333,7 +333,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);

		}
@@ -390,7 +390,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);

	}

}
@@ -504,7 +504,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);
@@ -515,7 +515,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;

}
@@ -827,10 +827,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.
@@ -914,10 +913,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;
@@ -1014,7 +1012,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);

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+3 −3
Original line number Diff line number Diff line
@@ -1509,7 +1509,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;
@@ -1520,7 +1520,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;
@@ -1664,7 +1664,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, 


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);

drivers/gpu/drm/i915/i915_gem_request.c

+3 −4
Original line number Diff line number Diff line
@@ -180,7 +180,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);

}
@@ -341,8 +341,7 @@ __i915_gem_request_alloc(struct intel_engine_cs *engine, 


	req->i915 = dev_priv;

	req->engine = engine;

	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
@@ -364,7 +363,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;

drivers/gpu/drm/i915/intel_lrc.c

+2 −2
Original line number Diff line number Diff line
@@ -980,7 +980,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);
@@ -992,6 +991,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:
@@ -1023,7 +1023,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)