diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-15 10:49:05 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-15 11:01:12 +0100 |
| commit | 19880c4a3f19a8ff116e992c2f79459b7c2d15c7 (patch) | |
| tree | bb637171e34a73643ff8dc0c166f4db2634783ff /drivers/gpu/drm/i915/intel_ringbuffer.c | |
| parent | 48bb74e48bc2cd106d7ed7697377c08d149f2633 (diff) | |
| download | op-kernel-dev-19880c4a3f19a8ff116e992c2f79459b7c2d15c7.zip op-kernel-dev-19880c4a3f19a8ff116e992c2f79459b7c2d15c7.tar.gz | |
drm/i915: Consolidate i915_vma_unpin_and_release()
In a few places, we repeat a call to clear a pointer to a vma whilst
unpinning and releasing a reference to its owner. Refactor those into a
common function.
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/1471254551-25805-26-git-send-email-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 30b0661..65ef172 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -1257,14 +1257,8 @@ static int init_render_ring(struct intel_engine_cs *engine) static void render_ring_cleanup(struct intel_engine_cs *engine) { struct drm_i915_private *dev_priv = engine->i915; - struct i915_vma *vma; - - vma = fetch_and_zero(&dev_priv->semaphore); - if (!vma) - return; - i915_vma_unpin(vma); - i915_vma_put(vma); + i915_vma_unpin_and_release(&dev_priv->semaphore); } static int gen8_rcs_signal(struct drm_i915_gem_request *req) |
