From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonathan Gray Subject: [PATCH xf86-video-intel] intel: replace direct ioctl use with drm{Set, Drop}Master Date: Sun, 30 Jun 2013 19:37:45 +1000 Message-ID: <20130630093745.GA10668@mail.netspace.net.au> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from lechuck.jsg.id.au (jsg.id.au [210.15.216.215]) by gabe.freedesktop.org (Postfix) with ESMTP id 21978E5BF7 for ; Sun, 30 Jun 2013 02:37:47 -0700 (PDT) Received: from carla.jsg.id.au (root@carla.jsg.id.au [192.168.1.42]) by lechuck.jsg.id.au (8.14.6/8.14.6) with ESMTP id r5U9bjrl011520 for ; Sun, 30 Jun 2013 19:37:45 +1000 (EST) Received: from carla.jsg.id.au (jsg@localhost.jsg.id.au [127.0.0.1]) by carla.jsg.id.au (8.14.6/8.14.3) with ESMTP id r5U9bjBh009590 for ; Sun, 30 Jun 2013 19:37:45 +1000 (EST) Received: (from jsg@localhost) by carla.jsg.id.au (8.14.6/8.14.3/Submit) id r5U9bjn3020272 for intel-gfx@lists.freedesktop.org; Sun, 30 Jun 2013 19:37:45 +1000 (EST) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org 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 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