XLibre/xf86-video-intel
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-intel.git synced 2026-03-24 01:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

intel: replace direct ioctl use with drm{Set, Drop}Master

Browse Source 
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>
This commit is contained in:
Jonathan Gray
2013-06-30 19:37:45 +10:00
committed by Chris Wilson
parent 40301e6d03
commit f8738d7b4c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/intel_device.c
View File

@@ -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;