summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_lrc.c
diff options
context:
space:
mode:
authorJohn Harrison2014-11-24 19:49:41 +0100
committerDaniel Vetter2014-12-03 09:35:22 +0100
commitff79e857024143f54aff5257c14595e949f46d8a (patch)
tree7566e16ff7dea7027b18178171b147a3cd1fc967 /drivers/gpu/drm/i915/intel_lrc.c
parentdrm/i915: Convert 'ring_idle()' to use requests not seqnos (diff)
downloadkernel-qcow2-linux-ff79e857024143f54aff5257c14595e949f46d8a.tar.gz
kernel-qcow2-linux-ff79e857024143f54aff5257c14595e949f46d8a.tar.xz
kernel-qcow2-linux-ff79e857024143f54aff5257c14595e949f46d8a.zip
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lrc.c')
-rw-r--r--drivers/gpu/drm/i915/intel_lrc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 1ed25a120159..b13221b86b05 100644
--- 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) {