From patchwork Tue Jun 14 09:03:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9175257 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E2D596048C for ; Tue, 14 Jun 2016 09:04:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D47E625404 for ; Tue, 14 Jun 2016 09:04:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C89382824A; Tue, 14 Jun 2016 09:04:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 913A625404 for ; Tue, 14 Jun 2016 09:04:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C7CE06E6FA; Tue, 14 Jun 2016 09:03:59 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 56A3E6E6F8 for ; Tue, 14 Jun 2016 09:03:50 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id n184so20723747wmn.1 for ; Tue, 14 Jun 2016 02:03:50 -0700 (PDT) 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=HkDCdpipN4YjUR7XRUYzzpv0ZecekuebsvfYCLlobbY=; b=NZdgpzdmFzMOQpWd2OZsX/PNuxmCOyCfTzVbHn0whIZDtTghZ4kvcRfrt2J0Z2+shA 4XTYvO6D0e2zFdGYmTklLvb8XMvSbJ4fsUWkIHnvTxeDgYO95+i5NYln+/g4ScCJkuYv 1O/GXppHZZYEH4ydhFTYZ7JQsaCUKC10CZWOY= 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=HkDCdpipN4YjUR7XRUYzzpv0ZecekuebsvfYCLlobbY=; b=FOyJ9DmkLYjMklkdNcLSFUSDrWjULSclF2WJ1t/3gIGHBR7Wke4jHrZhSGqzAEXv37 2QqI35pKHTnVX3uaz1Stu9SSNWZK/h9r3CZu2kr1VxAiKgoGBHlYu7kCwbIUVEoYGkEZ 2U1wSj0AIsEIxmIcodNR/5XtcEflvtX/sL4qtvcQ38Let0qvTbIJkYRerNp8cbKfNZ8l zE9Ekj3e2OLbyJNmp1B9IkbFDCkOF7YrlzYRS175tA2m7OV89vXHFlQ2B/qfBpIpd05z 4X1k+3QaxtYHtK++SiCzn03qXV5Pmb2NfJvlH9e0y7yl+Ehl9QZir+pbzBhEEjpG1mv3 F3dQ== X-Gm-Message-State: ALyK8tLHmneJ0gngeNGIPTWd/1atndNAiQbHy9hHMjqZmif3Or7xmUwzFfqKoR3+CeevjQ== X-Received: by 10.195.2.228 with SMTP id br4mr5821120wjd.59.1465895024308; Tue, 14 Jun 2016 02:03:44 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id j4sm31117915wjg.20.2016.06.14.02.03.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jun 2016 02:03:43 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 2/3] drm: Mark authmagic ioctls as unlocked Date: Tue, 14 Jun 2016 11:03:33 +0200 Message-Id: <1465895014-3839-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1465895014-3839-1-git-send-email-daniel.vetter@ffwll.ch> References: <1465895014-3839-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-Virus-Scanned: ClamAV using ClamSMTP All protected by dev->master_mutex. And there's no driver callbacks, which means no need to sync with old dri1 horror show drivers at all. Hence safe to drop the drm legacy BKL from these paths. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 6cc78d648393..288b047b2de5 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -467,7 +467,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = { DRM_IOCTL_DEF(DRM_IOCTL_VERSION, drm_version, DRM_UNLOCKED|DRM_RENDER_ALLOW|DRM_CONTROL_ALLOW), DRM_IOCTL_DEF(DRM_IOCTL_GET_UNIQUE, drm_getunique, 0), - DRM_IOCTL_DEF(DRM_IOCTL_GET_MAGIC, drm_getmagic, 0), + DRM_IOCTL_DEF(DRM_IOCTL_GET_MAGIC, drm_getmagic, DRM_UNLOCKED), DRM_IOCTL_DEF(DRM_IOCTL_IRQ_BUSID, drm_irq_by_busid, DRM_MASTER|DRM_ROOT_ONLY), DRM_IOCTL_DEF(DRM_IOCTL_GET_MAP, drm_legacy_getmap_ioctl, DRM_UNLOCKED), DRM_IOCTL_DEF(DRM_IOCTL_GET_CLIENT, drm_getclient, DRM_UNLOCKED), @@ -479,7 +479,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = { DRM_IOCTL_DEF(DRM_IOCTL_SET_UNIQUE, drm_invalid_op, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), DRM_IOCTL_DEF(DRM_IOCTL_BLOCK, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), DRM_IOCTL_DEF(DRM_IOCTL_UNBLOCK, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), - DRM_IOCTL_DEF(DRM_IOCTL_AUTH_MAGIC, drm_authmagic, DRM_AUTH|DRM_MASTER), + DRM_IOCTL_DEF(DRM_IOCTL_AUTH_MAGIC, drm_authmagic, DRM_AUTH|DRM_UNLOCKED|DRM_MASTER), DRM_IOCTL_DEF(DRM_IOCTL_ADD_MAP, drm_legacy_addmap_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), DRM_IOCTL_DEF(DRM_IOCTL_RM_MAP, drm_legacy_rmmap_ioctl, DRM_AUTH),