diff options
| author | Christian König <christian.koenig@amd.com> | 2019-08-11 10:06:32 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2019-08-13 09:09:30 +0200 |
| commit | 52791eeec1d9f4a7e7fe08aaba0b1553149d93bc (patch) | |
| tree | ea1ff9cb7040e20e2cedad4ca8f7d2994ce3d0a8 /drivers/gpu/drm/i915/i915_sw_fence.c | |
| parent | dma-buf: nuke reservation_object seq number (diff) | |
| download | linux-52791eeec1d9f4a7e7fe08aaba0b1553149d93bc.tar.xz linux-52791eeec1d9f4a7e7fe08aaba0b1553149d93bc.zip | |
dma-buf: rename reservation_object to dma_resv
Be more consistent with the naming of the other DMA-buf objects.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/323401/
Diffstat (limited to 'drivers/gpu/drm/i915/i915_sw_fence.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_sw_fence.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c index 5387aafd3424..362e4e00b4c6 100644 --- a/drivers/gpu/drm/i915/i915_sw_fence.c +++ b/drivers/gpu/drm/i915/i915_sw_fence.c @@ -7,7 +7,7 @@ #include <linux/slab.h> #include <linux/dma-fence.h> #include <linux/irq_work.h> -#include <linux/reservation.h> +#include <linux/dma-resv.h> #include "i915_sw_fence.h" #include "i915_selftest.h" @@ -510,7 +510,7 @@ int __i915_sw_fence_await_dma_fence(struct i915_sw_fence *fence, } int i915_sw_fence_await_reservation(struct i915_sw_fence *fence, - struct reservation_object *resv, + struct dma_resv *resv, const struct dma_fence_ops *exclude, bool write, unsigned long timeout, @@ -526,7 +526,7 @@ int i915_sw_fence_await_reservation(struct i915_sw_fence *fence, struct dma_fence **shared; unsigned int count, i; - ret = reservation_object_get_fences_rcu(resv, + ret = dma_resv_get_fences_rcu(resv, &excl, &count, &shared); if (ret) return ret; @@ -551,7 +551,7 @@ int i915_sw_fence_await_reservation(struct i915_sw_fence *fence, dma_fence_put(shared[i]); kfree(shared); } else { - excl = reservation_object_get_excl_rcu(resv); + excl = dma_resv_get_excl_rcu(resv); } if (ret >= 0 && excl && excl->ops != exclude) { |