geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
main
Andrey Grodzovsky 2017-11-02 10:29:55 -04:00 committed by Christian König
parent b617f059ad
commit f3091bac21
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
amdgpu/amdgpu.h
View File

@ -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 * \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 * 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 * \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 #ifdef __cplusplus
} }

8
amdgpu/amdgpu_vm.c
View File

@ -30,24 +30,24 @@
#include "xf86drm.h" #include "xf86drm.h"
#include "amdgpu_internal.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; union drm_amdgpu_vm vm;
vm.in.op = AMDGPU_VM_OP_RESERVE_VMID; vm.in.op = AMDGPU_VM_OP_RESERVE_VMID;
vm.in.flags = flags; vm.in.flags = flags;
return drmCommandWriteRead(context->dev->fd, DRM_AMDGPU_VM, return drmCommandWriteRead(dev->fd, DRM_AMDGPU_VM,
&vm, sizeof(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; union drm_amdgpu_vm vm;
vm.in.op = AMDGPU_VM_OP_UNRESERVE_VMID; vm.in.op = AMDGPU_VM_OP_UNRESERVE_VMID;
vm.in.flags = flags; vm.in.flags = flags;
return drmCommandWriteRead(context->dev->fd, DRM_AMDGPU_VM, return drmCommandWriteRead(dev->fd, DRM_AMDGPU_VM,
&vm, sizeof(vm)); &vm, sizeof(vm));
} }

4
tests/amdgpu/vm_tests.c
View File

@ -88,7 +88,7 @@ static void amdgpu_vmid_reserve_test(void)
CU_ASSERT_EQUAL(r, 0); CU_ASSERT_EQUAL(r, 0);
flags = 0; flags = 0;
r = amdgpu_vm_reserve_vmid(context_handle, flags); r = amdgpu_vm_reserve_vmid(device_handle, flags);
CU_ASSERT_EQUAL(r, 0); CU_ASSERT_EQUAL(r, 0);
@ -142,7 +142,7 @@ static void amdgpu_vmid_reserve_test(void)
CU_ASSERT_EQUAL(r, 0); CU_ASSERT_EQUAL(r, 0);
flags = 0; flags = 0;
r = amdgpu_vm_unreserve_vmid(context_handle, flags); r = amdgpu_vm_unreserve_vmid(device_handle, flags);
CU_ASSERT_EQUAL(r, 0); CU_ASSERT_EQUAL(r, 0);