diff options
| author |  Chris Wilson <chris@chris-wilson.co.uk>
| 2016-07-20 13:31:53 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk>
| 2016-07-20 13:40:12 +0100 |
| commit | f8c417cdb1b83c41520980af0bdc86e3951850b8 (patch) | |
| tree | 2af544a2c89756aad8ecd196600d1143059b7ca3 /drivers/gpu/drm/i915/i915_gem_context.c | |
| parent | drm/i915: Wrap drm_gem_object_reference in i915_gem_object_get (diff) | |
| download | linux-f8c417cdb1b83c41520980af0bdc86e3951850b8.tar.gz linux-f8c417cdb1b83c41520980af0bdc86e3951850b8.tar.bz2 linux-f8c417cdb1b83c41520980af0bdc86e3951850b8.zip | |
drm/i915: Rename drm_gem_object_unreference in preparation for lockless free
Ultimately wraps kref_put(), so adopt its nomenclature for consistency
with other subsystems.
s/drm_gem_object_unreference/i915_gem_object_put/
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1469005202-9659-6-git-send-email-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1469017917-15134-5-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 71517918853a..2600939fc2ee 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -176,7 +176,7 @@ void i915_gem_context_free(struct kref *ctx_ref) if (ce->ringbuf) intel_ringbuffer_free(ce->ringbuf); - drm_gem_object_unreference(&ce->state->base); + i915_gem_object_put(ce->state); } list_del(&ctx->link); @@ -216,7 +216,7 @@ i915_gem_alloc_context_obj(struct drm_device *dev, size_t size) ret = i915_gem_object_set_cache_level(obj, I915_CACHE_L3_LLC); /* Failure shouldn't ever happen this early */ if (WARN_ON(ret)) { - drm_gem_object_unreference(&obj->base); + i915_gem_object_put(obj); return ERR_PTR(ret); } } |