| Message ID | 20130630093745.GA10668@mail.netspace.net.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Jun 30, 2013 at 07:37:45PM +1000, Jonathan Gray wrote: > 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@jsg.id.au> Sigh. Thanks for the patch, pushed. -Chris
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;
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@jsg.id.au> --- src/intel_device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)