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

Commit 1dae2dfb authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Rename request->ringbuf to request->ring 



Now that we have disambuigated ring and engine, we can use the clearer
and more consistent name for the intel_ringbuffer pointer in the
request.

@@
struct drm_i915_gem_request *r;
@@
- r->ringbuf
+ r->ring

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1469432687-22756-12-git-send-email-chris@chris-wilson.co.uk
Link: http://patchwork.freedesktop.org/patch/msgid/1470174640-18242-2-git-send-email-chris@chris-wilson.co.uk
parent b5321f30

drivers/gpu/drm/i915/i915_gem_context.c

+2 −2
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ static inline int 
mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)

{

	struct drm_i915_private *dev_priv = req->i915;

	struct intel_ringbuffer *ring = req->ringbuf;

	struct intel_ringbuffer *ring = req->ring;

	struct intel_engine_cs *engine = req->engine;

	u32 flags = hw_flags | MI_MM_SPACE_GTT;

	const int num_rings =
@@ -655,7 +655,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags) 
static int remap_l3(struct drm_i915_gem_request *req, int slice)

{

	u32 *remap_info = req->i915->l3_parity.remap_info[slice];

	struct intel_ringbuffer *ring = req->ringbuf;

	struct intel_ringbuffer *ring = req->ring;

	int i, ret;



	if (!remap_info)

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+2 −2
Original line number Diff line number Diff line
@@ -1173,7 +1173,7 @@ i915_gem_execbuffer_retire_commands(struct i915_execbuffer_params *params) 
static int

i915_reset_gen7_sol_offsets(struct drm_i915_gem_request *req)

{

	struct intel_ringbuffer *ring = req->ringbuf;

	struct intel_ringbuffer *ring = req->ring;

	int ret, i;



	if (!IS_GEN7(req->i915) || req->engine->id != RCS) {
@@ -1303,7 +1303,7 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params, 


	if (params->engine->id == RCS &&

	    instp_mode != dev_priv->relative_constants_mode) {

		struct intel_ringbuffer *ring = params->request->ringbuf;

		struct intel_ringbuffer *ring = params->request->ring;



		ret = intel_ring_begin(params->request, 4);

		if (ret)

drivers/gpu/drm/i915/i915_gem_gtt.c

+3 −3
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ static int gen8_write_pdp(struct drm_i915_gem_request *req, 
			  unsigned entry,

			  dma_addr_t addr)

{

	struct intel_ringbuffer *ring = req->ringbuf;

	struct intel_ringbuffer *ring = req->ring;

	struct intel_engine_cs *engine = req->engine;

	int ret;
@@ -1661,7 +1661,7 @@ static uint32_t get_pd_offset(struct i915_hw_ppgtt *ppgtt) 
static int hsw_mm_switch(struct i915_hw_ppgtt *ppgtt,

			 struct drm_i915_gem_request *req)

{

	struct intel_ringbuffer *ring = req->ringbuf;

	struct intel_ringbuffer *ring = req->ring;

	struct intel_engine_cs *engine = req->engine;

	int ret;
@@ -1688,7 +1688,7 @@ static int hsw_mm_switch(struct i915_hw_ppgtt *ppgtt, 
static int gen7_mm_switch(struct i915_hw_ppgtt *ppgtt,

			  struct drm_i915_gem_request *req)

{

	struct intel_ringbuffer *ring = req->ringbuf;

	struct intel_ringbuffer *ring = req->ring;

	struct intel_engine_cs *engine = req->engine;

	int ret;

drivers/gpu/drm/i915/i915_gem_request.c

+8 −8
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static void i915_gem_request_retire(struct drm_i915_gem_request *request) 
	 * Note this requires that we are always called in request

	 * completion order.

	 */

	request->ringbuf->last_retired_head = request->postfix;

	request->ring->last_retired_head = request->postfix;



	i915_gem_request_remove_from_client(request);
@@ -423,7 +423,7 @@ void __i915_add_request(struct drm_i915_gem_request *request, 
			bool flush_caches)

{

	struct intel_engine_cs *engine;

	struct intel_ringbuffer *ringbuf;

	struct intel_ringbuffer *ring;

	u32 request_start;

	u32 reserved_tail;

	int ret;
@@ -432,14 +432,14 @@ void __i915_add_request(struct drm_i915_gem_request *request, 
		return;



	engine = request->engine;

	ringbuf = request->ringbuf;

	ring = request->ring;



	/*

	 * To ensure that this call will not fail, space for its emissions

	 * should already have been reserved in the ring buffer. Let the ring

	 * know that it is time to use that space up.

	 */

	request_start = intel_ring_get_tail(ringbuf);

	request_start = intel_ring_get_tail(ring);

	reserved_tail = request->reserved_space;

	request->reserved_space = 0;
@@ -486,21 +486,21 @@ void __i915_add_request(struct drm_i915_gem_request *request, 
	 * GPU processing the request, we never over-estimate the

	 * position of the head.

	 */

	request->postfix = intel_ring_get_tail(ringbuf);

	request->postfix = intel_ring_get_tail(ring);



	if (i915.enable_execlists) {

		ret = engine->emit_request(request);

	} else {

		ret = engine->add_request(request);



		request->tail = intel_ring_get_tail(ringbuf);

		request->tail = intel_ring_get_tail(ring);

	}

	/* Not allowed to fail! */

	WARN(ret, "emit|add_request failed: %d!\n", ret);

	/* Sanity check that the reserved size was large enough. */

	ret = intel_ring_get_tail(ringbuf) - request_start;

	ret = intel_ring_get_tail(ring) - request_start;

	if (ret < 0)

		ret += ringbuf->size;

		ret += ring->size;

	WARN_ONCE(ret > reserved_tail,

		  "Not enough space reserved (%d bytes) "

		  "for adding the request (%d bytes)\n",

drivers/gpu/drm/i915/i915_gem_request.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ struct drm_i915_gem_request { 
	 */

	struct i915_gem_context *ctx;

	struct intel_engine_cs *engine;

	struct intel_ringbuffer *ringbuf;

	struct intel_ringbuffer *ring;

	struct intel_signal_node signaling;



	/** GEM sequence number associated with the previous request,