OSDN Git Service
(root)
/
android-x86
/
external-libdrm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
android: switch to new build rules
[android-x86/external-libdrm.git]
/
xf86drm.c
diff --git
a/xf86drm.c
b/xf86drm.c
index
bc7a97f
..
6ea068f
100644
(file)
--- a/
xf86drm.c
+++ b/
xf86drm.c
@@
-820,7
+820,7
@@
int drmGetCap(int fd, uint64_t capability, uint64_t *value)
return ret;
*value = cap.value;
return ret;
*value = cap.value;
- return
cap.value
;
+ return
0
;
}
/**
}
/**
@@
-976,7
+976,7
@@
int drmAddMap(int fd, drm_handle_t offset, drmSize size, drmMapType type,
if (drmIoctl(fd, DRM_IOCTL_ADD_MAP, &map))
return -errno;
if (handle)
if (drmIoctl(fd, DRM_IOCTL_ADD_MAP, &map))
return -errno;
if (handle)
- *handle = (drm_handle_t)map.handle;
+ *handle = (drm_handle_t)
(uintptr_t)
map.handle;
return 0;
}
return 0;
}
@@
-984,7
+984,7
@@
int drmRmMap(int fd, drm_handle_t handle)
{
drm_map_t map;
{
drm_map_t map;
- map.handle = (void *)handle;
+ map.handle = (void *)
(uintptr_t)
handle;
if(drmIoctl(fd, DRM_IOCTL_RM_MAP, &map))
return -errno;
if(drmIoctl(fd, DRM_IOCTL_RM_MAP, &map))
return -errno;
@@
-2120,7
+2120,7
@@
int drmAddContextPrivateMapping(int fd, drm_context_t ctx_id,
drm_ctx_priv_map_t map;
map.ctx_id = ctx_id;
drm_ctx_priv_map_t map;
map.ctx_id = ctx_id;
- map.handle = (void *)handle;
+ map.handle = (void *)
(uintptr_t)
handle;
if (drmIoctl(fd, DRM_IOCTL_SET_SAREA_CTX, &map))
return -errno;
if (drmIoctl(fd, DRM_IOCTL_SET_SAREA_CTX, &map))
return -errno;
@@
-2137,7
+2137,7
@@
int drmGetContextPrivateMapping(int fd, drm_context_t ctx_id,
if (drmIoctl(fd, DRM_IOCTL_GET_SAREA_CTX, &map))
return -errno;
if (handle)
if (drmIoctl(fd, DRM_IOCTL_GET_SAREA_CTX, &map))
return -errno;
if (handle)
- *handle = (drm_handle_t)map.handle;
+ *handle = (drm_handle_t)
(uintptr_t)
map.handle;
return 0;
}
return 0;
}