From f8738d7b4cc1c624d4390ef9ce7426ba457d7dd3 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Sun, 30 Jun 2013 19:37:45 +1000 Subject: intel: replace direct ioctl use with drm{Set, Drop}Master Use drmSetMaster/drmDropMaster instead of calling the ioctls directly. Fixes compilation on OpenBSD where these ioctls aren't defined. Signed-off-by: Jonathan Gray --- src/intel_device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/intel_device.c b/src/intel_device.c index 5c369351..cb48c34a 100644 --- a/src/intel_device.c +++ b/src/intel_device.c @@ -222,7 +222,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); @@ -242,8 +242,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; -- cgit v1.2.3