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/vmwgfx/vmwgfx_cotable.c | |
| parent | 5d344f58da760b226562e7d5199fb73294eb93fa (diff) | |
| download | linux-52791eeec1d9f4a7e7fe08aaba0b1553149d93bc.tar.gz linux-52791eeec1d9f4a7e7fe08aaba0b1553149d93bc.tar.bz2 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/vmwgfx/vmwgfx_cotable.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c index 7984f172ec4a..1e3bd58bc2d4 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c @@ -169,7 +169,7 @@ static int vmw_cotable_unscrub(struct vmw_resource *res) } *cmd; WARN_ON_ONCE(bo->mem.mem_type != VMW_PL_MOB); - reservation_object_assert_held(bo->base.resv); + dma_resv_assert_held(bo->base.resv); cmd = VMW_FIFO_RESERVE(dev_priv, sizeof(*cmd)); if (!cmd) @@ -311,7 +311,7 @@ static int vmw_cotable_unbind(struct vmw_resource *res, return 0; WARN_ON_ONCE(bo->mem.mem_type != VMW_PL_MOB); - reservation_object_assert_held(bo->base.resv); + dma_resv_assert_held(bo->base.resv); mutex_lock(&dev_priv->binding_mutex); if (!vcotbl->scrubbed) |