radv/winsys: use amdgpu_bo_va_op_raw.

This is a precursor to the gfx9 fix to use uncached for the event
memory. Move to the interface which allows setting the flags,
but wrap it to avoid having to copy it around the place.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Cc: "17.2" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c
index 75444d57dac2a5ceba5c7638a940600311c20ca9..95290a468e74ac5b999203cf87135bb829257a8e 100644 (file)
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c
@@ -39,6 +39,23 @@
 
 static void radv_amdgpu_winsys_bo_destroy(struct radeon_winsys_bo *_bo);
 
+static int
+radv_amdgpu_bo_va_op(amdgpu_device_handle dev,
+                    amdgpu_bo_handle bo,
+                    uint64_t offset,
+                    uint64_t size,
+                    uint64_t addr,
+                    uint64_t flags,
+                    uint32_t ops)
+{
+       size = ALIGN(size, getpagesize());
+       flags |= (AMDGPU_VM_PAGE_READABLE |
+                 AMDGPU_VM_PAGE_WRITEABLE |
+                 AMDGPU_VM_PAGE_EXECUTABLE);
+       return amdgpu_bo_va_op_raw(dev, bo, offset, size, addr,
+                                  flags, ops);
+}
+
 static void
 radv_amdgpu_winsys_virtual_map(struct radv_amdgpu_winsys_bo *bo,
                                const struct radv_amdgpu_map_range *range)
@@ -49,8 +66,8 @@ radv_amdgpu_winsys_virtual_map(struct radv_amdgpu_winsys_bo *bo,
                return; /* TODO: PRT mapping */
 
        p_atomic_inc(&range->bo->ref_count);
-       int r = amdgpu_bo_va_op(range->bo->bo, range->bo_offset, range->size,
-                               range->offset + bo->va, 0, AMDGPU_VA_OP_MAP);
+       int r = radv_amdgpu_bo_va_op(bo->ws->dev, range->bo->bo, range->bo_offset, range->size,
+                                    range->offset + bo->va, 0, AMDGPU_VA_OP_MAP);
        if (r)
                abort();
 }
@@ -64,8 +81,8 @@ radv_amdgpu_winsys_virtual_unmap(struct radv_amdgpu_winsys_bo *bo,
        if (!range->bo)
                return; /* TODO: PRT mapping */
 
-       int r = amdgpu_bo_va_op(range->bo->bo, range->bo_offset, range->size,
-                               range->offset + bo->va, 0, AMDGPU_VA_OP_UNMAP);
+       int r = radv_amdgpu_bo_va_op(bo->ws->dev, range->bo->bo, range->bo_offset, range->size,
+                                    range->offset + bo->va, 0, AMDGPU_VA_OP_UNMAP);
        if (r)
                abort();
        radv_amdgpu_winsys_bo_destroy((struct radeon_winsys_bo *)range->bo);
@@ -235,7 +252,7 @@ static void radv_amdgpu_winsys_bo_destroy(struct radeon_winsys_bo *_bo)
                        bo->ws->num_buffers--;
                        pthread_mutex_unlock(&bo->ws->global_bo_list_lock);
                }
-               amdgpu_bo_va_op(bo->bo, 0, bo->size, bo->va, 0, AMDGPU_VA_OP_UNMAP);
+               radv_amdgpu_bo_va_op(bo->ws->dev, bo->bo, 0, bo->size, bo->va, 0, AMDGPU_VA_OP_UNMAP);
                amdgpu_bo_free(bo->bo);
        }
        amdgpu_va_range_free(bo->va_handle);
@@ -323,7 +340,7 @@ radv_amdgpu_winsys_bo_create(struct radeon_winsys *_ws,
                goto error_bo_alloc;
        }
 
-       r = amdgpu_bo_va_op(buf_handle, 0, size, va, 0, AMDGPU_VA_OP_MAP);
+       r = radv_amdgpu_bo_va_op(ws->dev, buf_handle, 0, size, va, 0, AMDGPU_VA_OP_MAP);
        if (r)
                goto error_va_map;
 
@@ -399,7 +416,7 @@ radv_amdgpu_winsys_bo_from_fd(struct radeon_winsys *_ws,
        if (r)
                goto error_query;
 
-       r = amdgpu_bo_va_op(result.buf_handle, 0, result.alloc_size, va, 0, AMDGPU_VA_OP_MAP);
+       r = radv_amdgpu_bo_va_op(ws->dev, result.buf_handle, 0, result.alloc_size, va, 0, AMDGPU_VA_OP_MAP);
        if (r)
                goto error_va_map;