From patchwork Tue Sep 8 11:56:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7140381 Return-Path: X-Original-To: patchwork-intel-gfx@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 ADD199F818 for ; Tue, 8 Sep 2015 11:54:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ED196206F4 for ; Tue, 8 Sep 2015 11:54:03 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 13006206EE for ; Tue, 8 Sep 2015 11:54:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E610C6E797; Tue, 8 Sep 2015 04:54:00 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0E7306E73D for ; Tue, 8 Sep 2015 04:53:58 -0700 (PDT) Received: by wicfx3 with SMTP id fx3so111997671wic.0 for ; Tue, 08 Sep 2015 04:53:56 -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=iyGPmBfWwIl3/WlMSvhKFiAU3i/Yhc52N2gzcTCEVbc=; b=NVD3RhLZPaWcKpYXFMffSK/XYCIt96pt/X0msPF3mt/HXKxk5OWI2Ma34RZpWQSK8n At06azgFIcZqwQfnQLAJheWda6X//5tTs/M1I/HNxZgEFpbZ5VI2owtYlPxAZ8V1KMux NX7/3k8llKzH+zZwCubYhzC+OEzmtRmkPRJk4= 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=iyGPmBfWwIl3/WlMSvhKFiAU3i/Yhc52N2gzcTCEVbc=; b=EBmsCl4OEQGIW81WoxjAUp1c7/wLiLoidUZNMruudpQny6v/HR5wtJsnQKybbvWKO7 PdJ6QhmjmoiBtuogCdNeR9XzBb1LamfNZflEqd0L+aeM8xSnYD6F8/Vyv2sQgi+yYe9U GR12HQTbA7coNujDsI5J12BdhYGBtdRiYulbg5UzKxL4LjRxWIEOdVZzv8ZiW+7q7OG5 ngNPgDYEiWARR/++1qTOzT2+JDfM84jfoEMdw1aWKOH5+r22TM5B8B2b5x+K0H859HUG laFpoY8FqrjobOaQPuAOwaskgkfYyrGYKoMid5AclzDn6ExcgeT60cXfHoKOg5S6F4aZ eCvg== X-Gm-Message-State: ALoCoQkeCeAl++7dMsaeWxboO4LwqC2RIykBVZLtL6v03ROvFEGpdlqteyDPTpDDE5QJ2QCocGeP X-Received: by 10.180.82.98 with SMTP id h2mr41818622wiy.37.1441713236780; Tue, 08 Sep 2015 04:53:56 -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 o10sm4480145wia.4.2015.09.08.04.53.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Sep 2015 04:53:56 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 8 Sep 2015 13:56:25 +0200 Message-Id: <1441713391-24732-6-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1441713391-24732-1-git-send-email-daniel.vetter@ffwll.ch> References: <1441713391-24732-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development Subject: [Intel-gfx] [PATCH 05/11] drm/i915: Mark getparam ioctl as DRM_UNLOCKED X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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 Reviewed-by: Chris Wilson --- 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 b1bcb7e8540a..3210a7ad49d6 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),