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_lrc.c | |
| parent | drm/i915: Use VMA for wa_ctx tracking (diff) | |
| download | linux-19880c4a3f19a8ff116e992c2f79459b7c2d15c7.tar.gz linux-19880c4a3f19a8ff116e992c2f79459b7c2d15c7.tar.bz2 linux-19880c4a3f19a8ff116e992c2f79459b7c2d15c7.zip | |
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_lrc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 64cb04e63512..2673fb4f817b 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1193,14 +1193,7 @@ err: static void lrc_destroy_wa_ctx_obj(struct intel_engine_cs *engine) { - struct i915_vma *vma; - - vma = fetch_and_zero(&engine->wa_ctx.vma); - if (!vma) - return; - - i915_vma_unpin(vma); - i915_vma_put(vma); + i915_vma_unpin_and_release(&engine->wa_ctx.vma); } static int intel_init_workaround_bb(struct intel_engine_cs *engine) |