diff options
| author | Andrey Grodzovsky <andrey.grodzovsky@amd.com> | 2017-11-02 10:29:55 -0400 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2017-11-03 13:07:30 +0100 |
| commit | f3091bac21a963f1a3d8ce5db85c0f2b4acbeb49 (patch) | |
| tree | 7ce9b56720642fe3f92a5f004ad75139dff75f8b | |
| parent | b617f059ad45517bded1f2d8c8e3a52b60e80bd7 (diff) | |
amdgpu: Fix wrappers for AMDGPU_VM IOCTL.
Rmove amdgpu_context_handle from the interface and use
amdgpu_device_handle instead. Uupdate VMID reservation test
accordingly.
Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
| -rw-r--r-- | amdgpu/amdgpu.h | 4 | ||||
| -rw-r--r-- | amdgpu/amdgpu_vm.c | 8 | ||||
| -rw-r--r-- | tests/amdgpu/vm_tests.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/amdgpu/amdgpu.h b/amdgpu/amdgpu.h index 597fc2ba..df85a24c 100644 --- a/amdgpu/amdgpu.h +++ b/amdgpu/amdgpu.h @@ -1496,7 +1496,7 @@ void amdgpu_cs_chunk_fence_info_to_data(struct amdgpu_cs_fence_info *fence_info, * * \return 0 on success otherwise POSIX Error code */ -int amdgpu_vm_reserve_vmid(amdgpu_context_handle context, uint32_t flags); +int amdgpu_vm_reserve_vmid(amdgpu_device_handle dev, uint32_t flags); /** * Free reserved VMID @@ -1505,7 +1505,7 @@ int amdgpu_vm_reserve_vmid(amdgpu_context_handle context, uint32_t flags); * * \return 0 on success otherwise POSIX Error code */ -int amdgpu_vm_unreserve_vmid(amdgpu_context_handle context, uint32_t flags); +int amdgpu_vm_unreserve_vmid(amdgpu_device_handle dev, uint32_t flags); #ifdef __cplusplus } diff --git a/amdgpu/amdgpu_vm.c b/amdgpu/amdgpu_vm.c index 304b423c..5ba7c082 100644 --- a/amdgpu/amdgpu_vm.c +++ b/amdgpu/amdgpu_vm.c @@ -30,24 +30,24 @@ #include "xf86drm.h" #include "amdgpu_internal.h" -int amdgpu_vm_reserve_vmid(amdgpu_context_handle context, uint32_t flags) +int amdgpu_vm_reserve_vmid(amdgpu_device_handle dev, uint32_t flags) { union drm_amdgpu_vm vm; vm.in.op = AMDGPU_VM_OP_RESERVE_VMID; vm.in.flags = flags; - return drmCommandWriteRead(context->dev->fd, DRM_AMDGPU_VM, + return drmCommandWriteRead(dev->fd, DRM_AMDGPU_VM, &vm, sizeof(vm)); } -int amdgpu_vm_unreserve_vmid(amdgpu_context_handle context, uint32_t flags) +int amdgpu_vm_unreserve_vmid(amdgpu_device_handle dev, uint32_t flags) { union drm_amdgpu_vm vm; vm.in.op = AMDGPU_VM_OP_UNRESERVE_VMID; vm.in.flags = flags; - return drmCommandWriteRead(context->dev->fd, DRM_AMDGPU_VM, + return drmCommandWriteRead(dev->fd, DRM_AMDGPU_VM, &vm, sizeof(vm)); } diff --git a/tests/amdgpu/vm_tests.c b/tests/amdgpu/vm_tests.c index cbfafe97..5f183107 100644 --- a/tests/amdgpu/vm_tests.c +++ b/tests/amdgpu/vm_tests.c @@ -88,7 +88,7 @@ static void amdgpu_vmid_reserve_test(void) CU_ASSERT_EQUAL(r, 0); flags = 0; - r = amdgpu_vm_reserve_vmid(context_handle, flags); + r = amdgpu_vm_reserve_vmid(device_handle, flags); CU_ASSERT_EQUAL(r, 0); @@ -142,7 +142,7 @@ static void amdgpu_vmid_reserve_test(void) CU_ASSERT_EQUAL(r, 0); flags = 0; - r = amdgpu_vm_unreserve_vmid(context_handle, flags); + r = amdgpu_vm_unreserve_vmid(device_handle, flags); CU_ASSERT_EQUAL(r, 0); |