From patchwork Wed Sep 9 14:46:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7147191 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 515289F380 for ; Wed, 9 Sep 2015 14:44:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7DAA52088A for ; Wed, 9 Sep 2015 14:44:13 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id AA76120878 for ; Wed, 9 Sep 2015 14:44:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ECFDD6EB89; Wed, 9 Sep 2015 07:44:11 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by gabe.freedesktop.org (Postfix) with ESMTPS id 24A406EB7F for ; Wed, 9 Sep 2015 07:44:10 -0700 (PDT) Received: by wicge5 with SMTP id ge5so158154243wic.0 for ; Wed, 09 Sep 2015 07:44:08 -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=nkhb3iXtB3P081dUQ4Mw0EsCRlnO7K+YdalpiyXuBsI=; b=aVDPrgBCq2TcjOSW2GNf0WDaSiEhOz/ZZG11VcMYQBHlutKpVkBGihi1vxaybxAMcy uZP3IvIO/WIMsQFqe3/wLR3BfETRj2Mx8XyABWkfRMmMyElt8fkJn0BPjrHc2ZrmFjDm GeF1YYR4kiXizTJRbaxT0T6AUDDREpwPo4kes= 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=nkhb3iXtB3P081dUQ4Mw0EsCRlnO7K+YdalpiyXuBsI=; b=TevCVqm7yrd1tGtulfqzaUldlAIAMqG10TiPZ/2myPRk0M7KLya4/te882W2Gsfz10 kbeiUhlsut+ilAt+YK7LwRQP4Yien1JddczqCEcaeR7Lyc/ybUSG8Vpyni5RWEdB9DK7 CaXPirrWyA3iGfTwU7hJ3nF8XiqPwm+UfJAelVJ/xG4O6KFegzvkO2t6aB8MDwb6TPfq riRYeFTRtZGOUqWdKkJOcnziZbIIsxMVdsZmdBPW0qq/HLUvbzMT8ViCAsWBk7vIU5VR pcWYhqI9OoPdCpCVXoBo0F44kWbZU83tOtr+Hp8cUzSUJKXNFFMc9juicR+o1IgNQn3w C2/Q== X-Gm-Message-State: ALoCoQlsxci3Ah2hAJazIpvTYuURCLfXK6ZEEnT66crQvs6LIIYhvy0CYG90RdK4I5gdrgHhG21b X-Received: by 10.180.184.134 with SMTP id eu6mr30344629wic.77.1441809848599; Wed, 09 Sep 2015 07:44:08 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id kb5sm10629442wjc.17.2015.09.09.07.44.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Sep 2015 07:44:07 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/i915: Mark getparam ioctl as DRM_UNLOCKED Date: Wed, 9 Sep 2015 16:46:49 +0200 Message-Id: <1441810009-12643-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1441713391-24732-5-git-send-email-daniel.vetter@ffwll.ch> References: <1441713391-24732-5-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development 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 With kms all the data getparam looks at is actually invariant, and certainly not protected by the global kms mutex. With ums all the setup code is already racy as hell, so this won't make things any worse. I've done this change so that all ioctl still used by kms drivers are marked as DRM_UNLOCKED, besides that we obviously don't need it any more in kms mode. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 5fff3e61610e..c2286a422333 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1224,7 +1224,7 @@ const struct drm_ioctl_desc i915_ioctls[] = { DRM_IOCTL_DEF_DRV(I915_BATCHBUFFER, drm_noop, DRM_AUTH), DRM_IOCTL_DEF_DRV(I915_IRQ_EMIT, drm_noop, DRM_AUTH), DRM_IOCTL_DEF_DRV(I915_IRQ_WAIT, drm_noop, DRM_AUTH), - DRM_IOCTL_DEF_DRV(I915_GETPARAM, i915_getparam, DRM_AUTH|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(I915_GETPARAM, i915_getparam, DRM_AUTH|DRM_RENDER_ALLOW|DRM_UNLOCKED), DRM_IOCTL_DEF_DRV(I915_SETPARAM, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), DRM_IOCTL_DEF_DRV(I915_ALLOC, drm_noop, DRM_AUTH), DRM_IOCTL_DEF_DRV(I915_FREE, drm_noop, DRM_AUTH),