Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101

2 files changed, 20 insertions, 0 deletions

diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c
index bcf562d5..53275f52 100644
--- a/libdrm/xf86drm.c
+++ b/libdrm/xf86drm.c
@@ -2977,3 +2977,20 @@ void drmCloseOnce(int fd)
 	}
     }
 }
+
+int drmSetMaster(int fd)
+{
+	int ret;
+
+	fprintf(stderr,"Setting master \n");
+	ret = ioctl(fd, DRM_IOCTL_SET_MASTER, 0);
+	return ret;
+}
+
+int drmDropMaster(int fd)
+{
+	int ret;
+	fprintf(stderr,"Dropping master \n");
+	ret = ioctl(fd, DRM_IOCTL_DROP_MASTER, 0);
+	return ret;
+}
diff --git a/libdrm/xf86drm.h b/libdrm/xf86drm.h
index 7b418604..35780aca 100644
--- a/libdrm/xf86drm.h
+++ b/libdrm/xf86drm.h
@@ -660,6 +660,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 int drmSetMaster(int fd);
+extern int drmDropMaster(int fd);
+
 #include "xf86mm.h"
 
 #endif