diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2009-01-26 23:14:38 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2009-01-26 23:14:38 +0000 |
| commit | 21374fcf52a6e392dc8ee256b080a129f6953363 (patch) | |
| tree | 47503fd5f50e1d07d4cc7c4a7e67a6f9ab4f549b /lib/libdrm/xf86drm.h | |
| parent | 1378ce0e4ab84ce707f389d4c7777f334f7bdb27 (diff) | |
Update libdrm to 2.4.3
This is needed for us to be able to update Mesa and xf86-video-intel.
Includes a few fixes, as well as the intel bufmgr interface and the
modesetting interface (which currently errors when you check if it's
enabled).
ok matthieu@
Diffstat (limited to 'lib/libdrm/xf86drm.h')
| -rw-r--r-- | lib/libdrm/xf86drm.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/libdrm/xf86drm.h b/lib/libdrm/xf86drm.h index 9a943b00d..784896700 100644 --- a/lib/libdrm/xf86drm.h +++ b/lib/libdrm/xf86drm.h @@ -47,13 +47,10 @@ (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) #define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP) -#ifdef __OpenBSD__ + #define DRM_DIR_NAME "/dev" #define DRM_DEV_NAME "%s/drm%d" -#else -#define DRM_DIR_NAME "/dev/dri" -#define DRM_DEV_NAME "%s/card%d" -#endif +#define DRM_CONTROL_DEV_NAME "%s/drmC%d" #define DRM_PROC_NAME "/proc/dri/" /* For backward Linux compatibility */ #define DRM_ERR_NO_DEVICE (-1001) @@ -79,6 +76,7 @@ typedef struct drmHashEntry { void *tagTable; } drmHashEntry; +extern int drmIoctl(int fd, unsigned long request, void *arg); extern void *drmGetHashTable(void); extern drmHashEntry *drmGetEntry(int fd); @@ -513,6 +511,7 @@ do { register unsigned int __old __asm("o0"); \ /* General user-level programmer's API: unprivileged */ extern int drmAvailable(void); extern int drmOpen(const char *name, const char *busid); +extern int drmOpenControl(int minor); extern int drmClose(int fd); extern drmVersionPtr drmGetVersion(int fd); extern drmVersionPtr drmGetLibVersion(int fd); @@ -662,5 +661,9 @@ extern int drmSLLookupNeighbors(void *l, unsigned long key, extern int drmOpenOnce(void *unused, const char *BusID, int *newlyopened); extern void drmCloseOnce(int fd); +extern void drmMsg(const char *format, ...); + +extern int drmSetMaster(int fd); +extern int drmDropMaster(int fd); #endif |