drm/i915: Connect requests to rings at creation not submission

johnharr-intel · danvet · commit ff79e8570241 · 2014-12-03T09:35:22.000+01:00
It makes a lot more sense (and makes future seqno -&gt; request conversion patches
simpler) to fill in the 'ring' field of the request structure at the point of
creation rather than submission. Given that the request structure is assigned by
ring specific code and thus is locked to a ring from the start, there really is
no reason to defer this assignment.

For: VIZ-4377
Signed-off-by: John Harrison &lt;John.C.Harrison@Intel.com&gt;
Reviewed-by: Thomas Daniel &lt;Thomas.Daniel@intel.com&gt;
Signed-off-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt;
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
@@ -2463,7 +2463,6 @@ int __i915_add_request(struct intel_engine_cs *ring,
 			return ret;
 	}
 
-	request->ring = ring;
 	request->head = request_start;
 	request->tail = request_ring_position;
 
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
@@ -898,6 +898,7 @@ static int logical_ring_alloc_request(struct intel_engine_cs *ring,
 	}
 
 	kref_init(&request->ref);
+	request->ring = ring;
 
 	ret = i915_gem_get_seqno(ring->dev, &request->seqno);
 	if (ret) {
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -2044,6 +2044,7 @@ intel_ring_alloc_request(struct intel_engine_cs *ring)
 		return -ENOMEM;
 
 	kref_init(&request->ref);
+	request->ring = ring;
 
 	ret = i915_gem_get_seqno(ring->dev, &request->seqno);
 	if (ret) {

Original file line number	Diff line number	Diff line change
`@@ -2463,7 +2463,6 @@ int __i915_add_request(struct intel_engine_cs *ring,`
`2463`	`2463`	`return ret;`
`2464`	`2464`	`}`
`2465`	`2465`
`2466`		`- request->ring = ring;`
`2467`	`2466`	`request->head = request_start;`
`2468`	`2467`	`request->tail = request_ring_position;`
`2469`	`2468`
Original file line number	Diff line number	Diff line change
`@@ -898,6 +898,7 @@ static int logical_ring_alloc_request(struct intel_engine_cs *ring,`
`898`	`898`	`}`
`899`	`899`
`900`	`900`	`kref_init(&request->ref);`
	`901`	`+ request->ring = ring;`
`901`	`902`
`902`	`903`	`ret = i915_gem_get_seqno(ring->dev, &request->seqno);`
`903`	`904`	`if (ret) {`