summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Brace <kevinbrace@bracecomputerlab.com>2022-09-08 16:45:30 -0700
committerKevin Brace <kevinbrace@bracecomputerlab.com>2022-09-08 16:45:30 -0700
commita616d2d47593867aeb89f167a51f3f0e4015a638 (patch)
treed39a00e12f397a962d4996d41c2a8fadd7b404c6
parentbdef377a506c59cf7d25d8b38bd5700e97c1e888 (diff)
Rearrange and rename uAPI IOCTL struct members
Signed-off-by: Kevin Brace <kevinbrace@bracecomputerlab.com>
-rw-r--r--src/via_drm.h4
-rw-r--r--src/via_memmgr.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/via_drm.h b/src/via_drm.h
index 55b69ac..1cceba5 100644
--- a/src/via_drm.h
+++ b/src/via_drm.h
@@ -293,8 +293,8 @@ typedef struct drm_via_dmablit {
* OpenChrome DRM IOCTL structs
*/
struct drm_via_gem_alloc {
- uint64_t size;
uint32_t alignment;
+ uint64_t size;
uint32_t domain;
uint32_t handle;
uint64_t offset;
@@ -302,7 +302,7 @@ struct drm_via_gem_alloc {
struct drm_via_gem_mmap {
uint32_t handle;
- uint64_t map_offset;
+ uint64_t offset;
};
#if defined(__cplusplus)
diff --git a/src/via_memmgr.c b/src/via_memmgr.c
index 4d88142..0113d56 100644
--- a/src/via_memmgr.c
+++ b/src/via_memmgr.c
@@ -151,8 +151,8 @@ drm_bo_alloc(ScrnInfoPtr pScrn, unsigned long size,
struct drm_via_gem_alloc args;
memset(&args, 0, sizeof(args));
- args.size = size;
args.alignment = alignment;
+ args.size = size;
args.domain = domain;
ret = drmCommandWriteRead(pVia->drmmode.fd,
DRM_VIA_GEM_ALLOC,
@@ -237,7 +237,7 @@ drm_bo_map(ScrnInfoPtr pScrn, struct buffer_object *obj)
}
obj->ptr = mmap(0, obj->size, PROT_READ | PROT_WRITE,
- MAP_SHARED, pVia->drmmode.fd, args.map_offset);
+ MAP_SHARED, pVia->drmmode.fd, args.offset);
if (obj->ptr == MAP_FAILED) {
DEBUG(ErrorF("mmap failed with error %d\n", -errno));
obj->ptr = NULL;