diff options
| author | Chris Wilson | 2016-08-02 23:50:29 +0200 |
|---|---|---|
| committer | Chris Wilson | 2016-08-02 23:58:24 +0200 |
| commit | c5efa1ad09784905ae31cd65b659cc73c09fd290 (patch) | |
| tree | b87da28fd7e4da5eada8378eeb20a397510c5a2b /drivers/gpu/drm/i915/i915_gem_request.c | |
| parent | drm/i915: Remove intel_ring_get_tail() (diff) | |
| download | kernel-qcow2-linux-c5efa1ad09784905ae31cd65b659cc73c09fd290.tar.gz kernel-qcow2-linux-c5efa1ad09784905ae31cd65b659cc73c09fd290.tar.xz kernel-qcow2-linux-c5efa1ad09784905ae31cd65b659cc73c09fd290.zip | |
drm/i915: Convert engine->write_tail to operate on a request
If we rewrite the I915_WRITE_TAIL specialisation for the legacy
ringbuffer as submitting the request onto the ringbuffer, we can unify
the vfunc with both execlists and GuC in the next patch.
v2: Drop the modulus from the I915_WRITE_TAIL as it is currently being
applied in intel_ring_advance() after every command packet, and add a
comment explaining why we need the modulus at all.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1469432687-22756-22-git-send-email-chris@chris-wilson.co.uk
Link: http://patchwork.freedesktop.org/patch/msgid/1470174640-18242-12-git-send-email-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_request.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_request.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c index 606b0b8a5f91..a885905df3bb 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.c +++ b/drivers/gpu/drm/i915/i915_gem_request.c @@ -466,15 +466,13 @@ void __i915_add_request(struct drm_i915_gem_request *request, */ request->postfix = ring->tail; - if (i915.enable_execlists) { + if (i915.enable_execlists) ret = engine->emit_request(request); - } else { + else ret = engine->add_request(request); - - request->tail = ring->tail; - } /* Not allowed to fail! */ WARN(ret, "emit|add_request failed: %d!\n", ret); + /* Sanity check that the reserved size was large enough. */ ret = ring->tail - request_start; if (ret < 0) |