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

Commit 0e50e96b authored by Mika Kuoppala's avatar Mika Kuoppala Committed by Daniel Vetter
Browse files

drm/i915: add context into request struct 



Storing context reference into request struct
allows us to inspect context and its associated
objects when requests are retired.

Both ppgtt and arb robustness work will need
this.

Signed-off-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 112522f6

drivers/gpu/drm/i915/i915_drv.h

+3 −0
Original line number Diff line number Diff line
@@ -1270,6 +1270,9 @@ struct drm_i915_gem_request { 
	/** Postion in the ringbuffer of the end of the request */

	u32 tail;



	/** Context related to this request */

	struct i915_hw_context *ctx;



	/** Time at which this request was emitted, in jiffies. */

	unsigned long emitted_jiffies;

drivers/gpu/drm/i915/i915_gem.c

+18 −6
Original line number Diff line number Diff line
@@ -2042,6 +2042,11 @@ i915_add_request(struct intel_ring_buffer *ring, 
	request->seqno = intel_ring_get_seqno(ring);

	request->ring = ring;

	request->tail = request_ring_position;

	request->ctx = ring->last_context;



	if (request->ctx)

		i915_gem_context_reference(request->ctx);



	request->emitted_jiffies = jiffies;

	was_empty = list_empty(&ring->request_list);

	list_add_tail(&request->list, &ring->request_list);
@@ -2094,6 +2099,17 @@ i915_gem_request_remove_from_client(struct drm_i915_gem_request *request) 
	spin_unlock(&file_priv->mm.lock);

}



static void i915_gem_free_request(struct drm_i915_gem_request *request)

{

	list_del(&request->list);

	i915_gem_request_remove_from_client(request);



	if (request->ctx)

		i915_gem_context_unreference(request->ctx);



	kfree(request);

}



static void i915_gem_reset_ring_lists(struct drm_i915_private *dev_priv,

				      struct intel_ring_buffer *ring)

{
@@ -2104,9 +2120,7 @@ static void i915_gem_reset_ring_lists(struct drm_i915_private *dev_priv, 
					   struct drm_i915_gem_request,

					   list);



		list_del(&request->list);

		i915_gem_request_remove_from_client(request);

		kfree(request);

		i915_gem_free_request(request);

	}



	while (!list_empty(&ring->active_list)) {
@@ -2198,9 +2212,7 @@ i915_gem_retire_requests_ring(struct intel_ring_buffer *ring) 
		 */

		ring->last_retired_head = request->tail;



		list_del(&request->list);

		i915_gem_request_remove_from_client(request);

		kfree(request);

		i915_gem_free_request(request);

	}



	/* Move any buffers on the active list that are no longer referenced