diff options
| author | Russell King <rmk_cubox@arm.linux.org.uk> | 2013-06-12 15:45:54 +0100 |
|---|---|---|
| committer | Russell King <rmk@arm.linux.org.uk> | 2013-06-12 15:45:54 +0100 |
| commit | 7923dea762934a715063465338a4d8e9275034e3 (patch) | |
| tree | bb2d78cea35e19fe743ada940e92aba15236eddc | |
| parent | 725cd0b771768a03c838d7972a2e2357091f1574 (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>
| -rw-r--r-- | armada_bufmgr.c | 5 | ||||
| -rw-r--r-- | armada_ioctl.h | 6 |
2 files changed, 2 insertions, 9 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); } diff --git a/armada_ioctl.h b/armada_ioctl.h index 780312c..2bb3146 100644 --- a/armada_ioctl.h +++ b/armada_ioctl.h @@ -22,11 +22,7 @@ DRM_##dir(DRM_COMMAND_BASE + DRM_ARMADA_##name, struct drm_armada_##str) struct drm_armada_gem_create { - uint32_t height; - uint32_t width; - uint32_t bpp; uint32_t handle; - uint32_t pitch; uint32_t size; }; #define DRM_IOCTL_ARMADA_GEM_CREATE \ @@ -51,10 +47,10 @@ struct drm_armada_gem_mmap { ARMADA_IOCTL(IOWR, GEM_MMAP, gem_mmap) struct drm_armada_gem_pwrite { + uint64_t ptr; uint32_t handle; uint32_t offset; uint32_t size; - uint64_t ptr; }; #define DRM_IOCTL_ARMADA_GEM_PWRITE \ ARMADA_IOCTL(IOW, GEM_PWRITE, gem_pwrite) |