diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-02 22:50:20 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-02 22:58:15 +0100 |
commit | dca33ecc5f1e5542b3f2fa2911b92f743369d367 (patch) | |
tree | c39ebade07fba4ee1d3febfd6d10c7278af5b100 /drivers/gpu/drm/i915/i915_gem_context.c | |
parent | drm/i915: Rename request->ringbuf to request->ring (diff) | |
download | linux-dca33ecc5f1e5542b3f2fa2911b92f743369d367.tar.gz linux-dca33ecc5f1e5542b3f2fa2911b92f743369d367.tar.bz2 linux-dca33ecc5f1e5542b3f2fa2911b92f743369d367.zip |
drm/i915: Rename intel_context[engine].ringbuf
Perform s/ringbuf/ring/ on the context struct for consistency with the
ring/engine split.
v2: Kill an outdated error_ringbuf label
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-14-git-send-email-chris@chris-wilson.co.uk
Link: http://patchwork.freedesktop.org/patch/msgid/1470174640-18242-3-git-send-email-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_context.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_context.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index f7f4a8c40afe..f825b1e4aadf 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -173,8 +173,8 @@ void i915_gem_context_free(struct kref *ctx_ref) continue; WARN_ON(ce->pin_count); - if (ce->ringbuf) - intel_ringbuffer_free(ce->ringbuf); + if (ce->ring) + intel_ringbuffer_free(ce->ring); i915_gem_object_put(ce->state); } |