summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2015-06-08 15:05:07 +0200
committerChristian König <christian.koenig@amd.com>2015-06-08 17:47:45 +0200
commit90efaf1ce0d362262544dc5649e93c061d036147 (patch)
tree9240a13d23508f5f915e228f8931607f56ed7ae1
parentf653d7ff4b5f9bf45b2c8692d01bdca94322463a (diff)
amdgpu: cleanup VA IOCTL handling
Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--amdgpu/amdgpu_bo.c32
-rw-r--r--include/drm/amdgpu_drm.h18
2 files changed, 18 insertions, 32 deletions
diff --git a/amdgpu/amdgpu_bo.c b/amdgpu/amdgpu_bo.c
index ce8d2ebb..4ffb5ebd 100644
--- a/amdgpu/amdgpu_bo.c
+++ b/amdgpu/amdgpu_bo.c
@@ -56,7 +56,7 @@ static void amdgpu_close_kms_handle(amdgpu_device_handle dev,
static int amdgpu_bo_map(amdgpu_bo_handle bo, uint32_t alignment)
{
amdgpu_device_handle dev = bo->dev;
- union drm_amdgpu_gem_va va;
+ struct drm_amdgpu_gem_va va;
int r;
memset(&va, 0, sizeof(va));
@@ -67,17 +67,17 @@ static int amdgpu_bo_map(amdgpu_bo_handle bo, uint32_t alignment)
if (bo->virtual_mc_base_address == AMDGPU_INVALID_VA_ADDRESS)
return -ENOSPC;
- va.in.handle = bo->handle;
- va.in.operation = AMDGPU_VA_OP_MAP;
- va.in.flags = AMDGPU_VM_PAGE_READABLE |
+ va.handle = bo->handle;
+ va.operation = AMDGPU_VA_OP_MAP;
+ va.flags = AMDGPU_VM_PAGE_READABLE |
AMDGPU_VM_PAGE_WRITEABLE |
AMDGPU_VM_PAGE_EXECUTABLE;
- va.in.va_address = bo->virtual_mc_base_address;
- va.in.offset_in_bo = 0;
- va.in.map_size = ALIGN(bo->alloc_size, getpagesize());
+ va.va_address = bo->virtual_mc_base_address;
+ va.offset_in_bo = 0;
+ va.map_size = ALIGN(bo->alloc_size, getpagesize());
r = drmCommandWriteRead(dev->fd, DRM_AMDGPU_GEM_VA, &va, sizeof(va));
- if (r || va.out.result == AMDGPU_VA_RESULT_ERROR) {
+ if (r) {
amdgpu_bo_free_internal(bo);
return r;
}
@@ -89,7 +89,7 @@ static int amdgpu_bo_map(amdgpu_bo_handle bo, uint32_t alignment)
static void amdgpu_bo_unmap(amdgpu_bo_handle bo)
{
amdgpu_device_handle dev = bo->dev;
- union drm_amdgpu_gem_va va;
+ struct drm_amdgpu_gem_va va;
int r;
if (bo->virtual_mc_base_address == AMDGPU_INVALID_VA_ADDRESS)
@@ -97,17 +97,17 @@ static void amdgpu_bo_unmap(amdgpu_bo_handle bo)
memset(&va, 0, sizeof(va));
- va.in.handle = bo->handle;
- va.in.operation = AMDGPU_VA_OP_UNMAP;
- va.in.flags = AMDGPU_VM_PAGE_READABLE |
+ va.handle = bo->handle;
+ va.operation = AMDGPU_VA_OP_UNMAP;
+ va.flags = AMDGPU_VM_PAGE_READABLE |
AMDGPU_VM_PAGE_WRITEABLE |
AMDGPU_VM_PAGE_EXECUTABLE;
- va.in.va_address = bo->virtual_mc_base_address;
- va.in.offset_in_bo = 0;
- va.in.map_size = ALIGN(bo->alloc_size, getpagesize());
+ va.va_address = bo->virtual_mc_base_address;
+ va.offset_in_bo = 0;
+ va.map_size = ALIGN(bo->alloc_size, getpagesize());
r = drmCommandWriteRead(dev->fd, DRM_AMDGPU_GEM_VA, &va, sizeof(va));
- if (r || va.out.result == AMDGPU_VA_RESULT_ERROR) {
+ if (r) {
fprintf(stderr, "amdgpu: VA_OP_UNMAP failed with %d\n", r);
return;
}
diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h
index 3e106ab1..4cfee73c 100644
--- a/include/drm/amdgpu_drm.h
+++ b/include/drm/amdgpu_drm.h
@@ -55,7 +55,7 @@
#define DRM_IOCTL_AMDGPU_INFO DRM_IOW(DRM_COMMAND_BASE + DRM_AMDGPU_INFO, struct drm_amdgpu_info)
#define DRM_IOCTL_AMDGPU_GEM_METADATA DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_METADATA, struct drm_amdgpu_gem_metadata)
#define DRM_IOCTL_AMDGPU_GEM_WAIT_IDLE DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_WAIT_IDLE, union drm_amdgpu_gem_wait_idle)
-#define DRM_IOCTL_AMDGPU_GEM_VA DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_VA, union drm_amdgpu_gem_va)
+#define DRM_IOCTL_AMDGPU_GEM_VA DRM_IOW(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_VA, struct drm_amdgpu_gem_va)
#define DRM_IOCTL_AMDGPU_WAIT_CS DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_WAIT_CS, union drm_amdgpu_wait_cs)
#define DRM_IOCTL_AMDGPU_GEM_OP DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_OP, struct drm_amdgpu_gem_op)
#define DRM_IOCTL_AMDGPU_GEM_USERPTR DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_USERPTR, struct drm_amdgpu_gem_userptr)
@@ -290,10 +290,6 @@ struct drm_amdgpu_gem_op {
#define AMDGPU_VA_OP_MAP 1
#define AMDGPU_VA_OP_UNMAP 2
-#define AMDGPU_VA_RESULT_OK 0
-#define AMDGPU_VA_RESULT_ERROR 1
-#define AMDGPU_VA_RESULT_VA_INVALID_ALIGNMENT 2
-
/* Mapping flags */
/* readable mapping */
#define AMDGPU_VM_PAGE_READABLE (1 << 1)
@@ -302,7 +298,7 @@ struct drm_amdgpu_gem_op {
/* executable mapping, new for VI */
#define AMDGPU_VM_PAGE_EXECUTABLE (1 << 3)
-struct drm_amdgpu_gem_va_in {
+struct drm_amdgpu_gem_va {
/* GEM object handle */
uint32_t handle;
uint32_t _pad;
@@ -319,16 +315,6 @@ struct drm_amdgpu_gem_va_in {
uint64_t map_size;
};
-struct drm_amdgpu_gem_va_out {
- uint32_t result;
- uint32_t _pad;
-};
-
-union drm_amdgpu_gem_va {
- struct drm_amdgpu_gem_va_in in;
- struct drm_amdgpu_gem_va_out out;
-};
-
#define AMDGPU_HW_IP_GFX 0
#define AMDGPU_HW_IP_COMPUTE 1
#define AMDGPU_HW_IP_DMA 2