[PATCH xf86-video-intel] intel: replace direct ioctl use with drm{Set, Drop}Master

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Use drmSetMaster/drmDropMaster instead of calling the ioctls
directly.  Fixes compilation on OpenBSD where these ioctls
aren't defined.

Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
---
 src/intel_device.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git src/intel_device.c src/intel_device.c
index 5c49db0..1b2f33c 100644
--- src/intel_device.c
+++ src/intel_device.c
@@ -202,7 +202,7 @@ int intel_get_master(ScrnInfoPtr scrn)
 		int retry = 2000;
 
 		do {
-			ret = ioctl(dev->fd, DRM_IOCTL_SET_MASTER);
+			ret = drmSetMaster(dev->fd);
 			if (ret == 0)
 				break;
 			usleep(1000);
@@ -222,8 +222,8 @@ int intel_put_master(ScrnInfoPtr scrn)
 	ret = 0;
 	assert(dev->master_count);
 	if (--dev->master_count == 0) {
-		assert(ioctl(dev->fd, DRM_IOCTL_SET_MASTER) == 0);
-		ret = ioctl(dev->fd, DRM_IOCTL_DROP_MASTER);
+		assert(drmSetMaster(dev->fd) == 0);
+		ret = drmDropMaster(dev->fd);
 	}
 
 	return ret;
-- 
1.8.3.1



[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux