diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-10-26 10:33:42 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-10-26 10:33:42 +0200 |
| commit | 343696583c77983ac7689b24cd49529864035cf7 (patch) | |
| tree | a384fc19a0d267fb6989c18d0d6a9c0364f69bc3 /libdrm | |
| parent | 26c32a3d797efb7474e5ae88c46afcb0e6015294 (diff) | |
| parent | a4c87d3796cac374d25e01b26bdbb9028ce03107 (diff) | |
Merge branch 'master' into modesetting-101
Diffstat (limited to 'libdrm')
| -rw-r--r-- | libdrm/xf86drm.c | 4 | ||||
| -rw-r--r-- | libdrm/xf86mm.h | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c index 2f9d5c80..7001a0ef 100644 --- a/libdrm/xf86drm.c +++ b/libdrm/xf86drm.c @@ -2865,7 +2865,7 @@ int drmBOVersion(int fd, unsigned int *major, memset(&arg, 0, sizeof(arg)); ret = ioctl(fd, DRM_IOCTL_BO_VERSION, &arg); if (ret) - return ret; + return -errno; if (major) *major = arg.major; @@ -2874,7 +2874,7 @@ int drmBOVersion(int fd, unsigned int *major, if (patchlevel) *patchlevel = arg.patchlevel; - return (ret) ? -errno : 0; + return 0; } diff --git a/libdrm/xf86mm.h b/libdrm/xf86mm.h index 49ae2c04..d3df8497 100644 --- a/libdrm/xf86mm.h +++ b/libdrm/xf86mm.h @@ -29,6 +29,7 @@ #ifndef _XF86MM_H_ #define _XF86MM_H_ #include <stddef.h> +#include <stdint.h> #include "drm.h" /* @@ -37,7 +38,7 @@ * be protected using an external mutex. * * Note: Don't protect the following functions, as it may lead to deadlocks: - * drmBOUnmap(), drmFenceBuffers(). + * drmBOUnmap(). * The kernel is synchronizing and refcounting buffer maps. * User space only needs to refcount object usage within the same application. */ @@ -156,9 +157,6 @@ extern int drmBOUnreference(int fd, drmBO *buf); extern int drmBOMap(int fd, drmBO *buf, unsigned mapFlags, unsigned mapHint, void **address); extern int drmBOUnmap(int fd, drmBO *buf); -extern int drmBOValidate(int fd, drmBO *buf, uint32_t fence_class, uint64_t flags, - uint64_t mask, unsigned hint); - extern int drmBOFence(int fd, drmBO *buf, unsigned flags, unsigned fenceHandle); extern int drmBOInfo(int fd, drmBO *buf); extern int drmBOBusy(int fd, drmBO *buf, int *busy); |