From patchwork Wed Feb 11 11:42:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 5812281 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 10EAB9F30C for ; Wed, 11 Feb 2015 11:41:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2AD8C2024F for ; Wed, 11 Feb 2015 11:41:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3F73020221 for ; Wed, 11 Feb 2015 11:41:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DDE436E595; Wed, 11 Feb 2015 03:41:30 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by gabe.freedesktop.org (Postfix) with ESMTP id B20EF6E59F for ; Wed, 11 Feb 2015 03:41:29 -0800 (PST) Received: by mail-wi0-f182.google.com with SMTP id n3so4146719wiv.3 for ; Wed, 11 Feb 2015 03:41:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=w9J2hC1YQLtSk4f9c0XWdJTg5bo2JCo2TtHlDZigR3Y=; b=WtSygYEvJPyy7gNOywwwIcTieMzo+1AJbVqllbV+zvrAGz72Qn/audTOCV5XLRweVF tPxIPIYWnEh5gNTb3119q3cBu81bJCPWL24huCi1DyViA/6ZMIFph7YMal6uVnrGpqmf Yh75Qt6VHsJM1X9+GT8Xc7KgACw93J6AmQ0j4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=w9J2hC1YQLtSk4f9c0XWdJTg5bo2JCo2TtHlDZigR3Y=; b=ADEHW9ek7GUDsI58EvXKxPzHsa/lFgLQB50ByAn3Od0Xtcn4gW9YiqJfQXHeQMy3KX ziP8YzEWkIOrl2sGyQwLmUL/SzzoZZRsIbvpblSLLFDNlLRRjLgJHw0TzXxLs9cGOZ+X PSJkgeNPpu9A9EflPXeA4zDlaErkRW54Lg9ySnEJKpCqoSJWMTyHyQ0WNU5gqmgVX5kQ iOmpGLLdCCdcIoVfwjfR0qYARtDtqiZP16KGhSMqJCZS1A7AjY+HaqamrtZdWtlvQOSn gr+X3kq4enpLjLaSbNJ9jC/lvsi3Mb13EmkgEfdb8Ix8DrDY+NiKkloG3JEKba8H+5m2 6oBw== X-Gm-Message-State: ALoCoQloJ9mhZddpjOIr1UmtH/tcizb3ulWnTZvGz+cSho30rv0BsIBZDWVUFXz19e6IEjJR+HE1 X-Received: by 10.194.205.228 with SMTP id lj4mr61579746wjc.77.1423654889149; Wed, 11 Feb 2015 03:41:29 -0800 (PST) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by mx.google.com with ESMTPSA id pp10sm897062wjc.31.2015.02.11.03.41.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Feb 2015 03:41:27 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development , DRI Development Subject: [PATCH 3/4] drm: use drmIoctl everywhere Date: Wed, 11 Feb 2015 12:42:47 +0100 Message-Id: <1423654968-10553-3-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1423654968-10553-1-git-send-email-daniel.vetter@ffwll.ch> References: <1423654968-10553-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Well just core drm. All the other callers in there that still use direct calls to ioctl have some custom retry logic already, so should be good already. freedreno/kgsl ahas all the other bare ioctl calls, dunnot what to do about that. Signed-off-by: Daniel Vetter Reviewed-by: Emil Velikov --- xf86drm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xf86drm.c b/xf86drm.c index fb673b58afb3..263d6835c29a 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -2543,12 +2543,12 @@ void drmCloseOnce(int fd) int drmSetMaster(int fd) { - return ioctl(fd, DRM_IOCTL_SET_MASTER, 0); + return drmIoctl(fd, DRM_IOCTL_SET_MASTER, 0); } int drmDropMaster(int fd) { - return ioctl(fd, DRM_IOCTL_DROP_MASTER, 0); + return drmIoctl(fd, DRM_IOCTL_DROP_MASTER, 0); } char *drmGetDeviceNameFromFd(int fd)