Merge tag 'drm-misc-next-2019-08-19' of git://anongit.freedesktop.org/drm/drm-misc...

[J-linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_dma_buf.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
index f0db7ddcb61b2f7fa8dd7c3b7b948069194acd73..61f108ec2b5c3c159a7efa517bb380665bc26d1d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
@@ -137,23 +137,23 @@ int amdgpu_gem_prime_mmap(struct drm_gem_object *obj,
 }
 
 static int
-__reservation_object_make_exclusive(struct reservation_object *obj)
+__dma_resv_make_exclusive(struct dma_resv *obj)
 {
        struct dma_fence **fences;
        unsigned int count;
        int r;
 
-       if (!reservation_object_get_list(obj)) /* no shared fences to convert */
+       if (!dma_resv_get_list(obj)) /* no shared fences to convert */
                return 0;
 
-       r = reservation_object_get_fences_rcu(obj, NULL, &count, &fences);
+       r = dma_resv_get_fences_rcu(obj, NULL, &count, &fences);
        if (r)
                return r;
 
        if (count == 0) {
                /* Now that was unexpected. */
        } else if (count == 1) {
-               reservation_object_add_excl_fence(obj, fences[0]);
+               dma_resv_add_excl_fence(obj, fences[0]);
                dma_fence_put(fences[0]);
                kfree(fences);
        } else {
@@ -165,7 +165,7 @@ __reservation_object_make_exclusive(struct reservation_object *obj)
                if (!array)
                        goto err_fences_put;
 
-               reservation_object_add_excl_fence(obj, &array->base);
+               dma_resv_add_excl_fence(obj, &array->base);
                dma_fence_put(&array->base);
        }
 
@@ -216,7 +216,7 @@ static int amdgpu_dma_buf_map_attach(struct dma_buf *dma_buf,
                 * fences on the reservation object into a single exclusive
                 * fence.
                 */
-               r = __reservation_object_make_exclusive(bo->tbo.base.resv);
+               r = __dma_resv_make_exclusive(bo->tbo.base.resv);
                if (r)
                        goto error_unreserve;
        }
@@ -367,7 +367,7 @@ amdgpu_gem_prime_import_sg_table(struct drm_device *dev,
                                 struct dma_buf_attachment *attach,
                                 struct sg_table *sg)
 {
-       struct reservation_object *resv = attach->dmabuf->resv;
+       struct dma_resv *resv = attach->dmabuf->resv;
        struct amdgpu_device *adev = dev->dev_private;
        struct amdgpu_bo *bo;
        struct amdgpu_bo_param bp;
@@ -380,7 +380,7 @@ amdgpu_gem_prime_import_sg_table(struct drm_device *dev,
        bp.flags = 0;
        bp.type = ttm_bo_type_sg;
        bp.resv = resv;
-       reservation_object_lock(resv, NULL);
+       dma_resv_lock(resv, NULL);
        ret = amdgpu_bo_create(adev, &bp, &bo);
        if (ret)
                goto error;
@@ -392,11 +392,11 @@ amdgpu_gem_prime_import_sg_table(struct drm_device *dev,
        if (attach->dmabuf->ops != &amdgpu_dmabuf_ops)
                bo->prime_shared_count = 1;
 
-       reservation_object_unlock(resv);
+       dma_resv_unlock(resv);
        return &bo->tbo.base;
 
 error:
-       reservation_object_unlock(resv);
+       dma_resv_unlock(resv);
        return ERR_PTR(ret);
 }