geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into modesetting-101

main
Thomas Hellstrom 2007-10-26 10:33:42 +02:00
parent 26c32a3d79 a4c87d3796
commit 343696583c
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libdrm/xf86drm.c
View File

@ -2865,7 +2865,7 @@ int drmBOVersion(int fd, unsigned int *major,
memset(&arg, 0, sizeof(arg)); memset(&arg, 0, sizeof(arg));
ret = ioctl(fd, DRM_IOCTL_BO_VERSION, &arg); ret = ioctl(fd, DRM_IOCTL_BO_VERSION, &arg);
if (ret) if (ret)
return ret; return -errno;
if (major) if (major)
*major = arg.major; *major = arg.major;
@ -2874,7 +2874,7 @@ int drmBOVersion(int fd, unsigned int *major,
if (patchlevel) if (patchlevel)
*patchlevel = arg.patchlevel; *patchlevel = arg.patchlevel;
return (ret) ? -errno : 0; return 0;
} }

6
libdrm/xf86mm.h
View File

@ -29,6 +29,7 @@
#ifndef _XF86MM_H_ #ifndef _XF86MM_H_
#define _XF86MM_H_ #define _XF86MM_H_
#include <stddef.h> #include <stddef.h>
#include <stdint.h>
#include "drm.h" #include "drm.h"
/* /*
@ -37,7 +38,7 @@
* be protected using an external mutex. * be protected using an external mutex.
* *
* Note: Don't protect the following functions, as it may lead to deadlocks: * Note: Don't protect the following functions, as it may lead to deadlocks:
* drmBOUnmap(), drmFenceBuffers(). * drmBOUnmap().
* The kernel is synchronizing and refcounting buffer maps. * The kernel is synchronizing and refcounting buffer maps.
* User space only needs to refcount object usage within the same application. * 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, extern int drmBOMap(int fd, drmBO *buf, unsigned mapFlags, unsigned mapHint,
void **address); void **address);
extern int drmBOUnmap(int fd, drmBO *buf); 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 drmBOFence(int fd, drmBO *buf, unsigned flags, unsigned fenceHandle);
extern int drmBOInfo(int fd, drmBO *buf); extern int drmBOInfo(int fd, drmBO *buf);
extern int drmBOBusy(int fd, drmBO *buf, int *busy); extern int drmBOBusy(int fd, drmBO *buf, int *busy);