summaryrefslogtreecommitdiff
path: root/armada_bufmgr.c
diff options
context:
space:
mode:
authorRussell King <rmk_cubox@arm.linux.org.uk>2013-06-12 15:45:54 +0100
committerRussell King <rmk@arm.linux.org.uk>2013-06-12 15:45:54 +0100
commit7923dea762934a715063465338a4d8e9275034e3 (patch)
treebb2d78cea35e19fe743ada940e92aba15236eddc /armada_bufmgr.c
parent725cd0b771768a03c838d7972a2e2357091f1574 (diff)
Kernel API updates
Get rid of unused members in the create ioctl, and re-shuffle the pwrite ioctl to avoid any ABI issues. Signed-off-by: Russell King <rmk_cubox@arm.linux.org.uk>
Diffstat (limited to 'armada_bufmgr.c')
-rw-r--r--armada_bufmgr.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/armada_bufmgr.c b/armada_bufmgr.c
index 01d9955..2364051 100644
--- a/armada_bufmgr.c
+++ b/armada_bufmgr.c
@@ -329,9 +329,6 @@ struct drm_armada_bo *drm_armada_bo_create(struct drm_armada_bufmgr *mgr,
return NULL;
memset(&arg, 0, sizeof(arg));
- arg.width = w;
- arg.height = h;
- arg.bpp = bpp;
arg.size = alloc_size;
ret = drmIoctl(fd, DRM_IOCTL_ARMADA_GEM_CREATE, &arg);
@@ -524,10 +521,10 @@ int drm_armada_bo_subdata(struct drm_armada_bo *dbo, unsigned long offset,
int fd = bo->mgr->fd;
memset(&arg, 0, sizeof(arg));
+ arg.ptr = (uint64_t)(uintptr_t)data;
arg.handle = bo->bo.handle;
arg.offset = offset;
arg.size = size;
- arg.ptr = (uint64_t)(uintptr_t)data;
return drmIoctl(fd, DRM_IOCTL_ARMADA_GEM_PWRITE, &arg);
}