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

It makes a lot more sense (and makes future seqno -> 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 <John.C.Harrison@Intel.com>
Reviewed-by: Thomas Daniel <Thomas.Daniel@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
John Harrison 2014-11-24 18:49:41 +00:00 committed by Daniel Vetter
parent 44cdd6d219
commit ff79e85702
3 changed files with 2 additions and 1 deletions

View File

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

View File

@ -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) {

View File

@ -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) {