From patchwork Thu Apr 6 19:06:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9668123 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 94719602B3 for ; Thu, 6 Apr 2017 19:07:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 779F81FFDB for ; Thu, 6 Apr 2017 19:07:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 69F2C25E13; Thu, 6 Apr 2017 19:07:04 +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]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E3DAF1FFDB for ; Thu, 6 Apr 2017 19:07:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 26A496E9F1; Thu, 6 Apr 2017 19:07:03 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6704B6E9F1 for ; Thu, 6 Apr 2017 19:07:01 +0000 (UTC) Received: by mail-wr0-x244.google.com with SMTP id u18so5991853wrc.1 for ; Thu, 06 Apr 2017 12:07:01 -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=G/w8qXK2A3PXWumhMp5li168PQVE3SmAp2zEilIo0Xw=; b=ccJN7P29ETBYeyFlITH2oW/Xxhw2eAW09zf+0hz63NkmwMibQlujtE4AQar+RZho4z sTB+9zSPxGOqUEkbQZdHNOhhmi8cXAwOFv9peZcQ28bJV6F6XUGxkS97YcBjT/Kki+n5 AX/Tny2p7f+pA6t1vq3fg0OsbR7tW/ajMYUeQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=G/w8qXK2A3PXWumhMp5li168PQVE3SmAp2zEilIo0Xw=; b=YPHCHoHNDHShU3GsPgkqXQuLfgj3YDXCWM2dqhTcNebWUfivOKKjznP9B/JLdbHbRS CdLHrUOMxiLbbv5Hq15yJPZzRVrz50LEBotf7lEP4I0wjl2E81fm4BP3nUrZwm4zh7xQ IMf56xEEKUMbZSz9TalbBd5tDaumkAuQzfzcvnA7Bwe/1sHRqwoqL6K1I+gCMV5n5e5b ATOiTE/HF03p3BfHfjfBQN67Cgjd757HeVHJ77iSeYDxoeRgNlcvXlQvaF/DG/KQyA38 eTE/2t3jqlfNrbZZyDrqK54cKDfHwKrc4nrN3NHkXqvndr1wgm6zyxpsv9WXdhe6mamF ulmQ== X-Gm-Message-State: AN3rC/5Q2omc/P+daa2jjZwMQdnO7Uh7+goY+Vbz+5UXpXrIQpmwD92XNt+zQknpQRYsnQ== X-Received: by 10.28.107.150 with SMTP id a22mr6635534wmi.81.1491505620023; Thu, 06 Apr 2017 12:07:00 -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 f62sm12789957wmh.33.2017.04.06.12.06.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Apr 2017 12:06:59 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 6 Apr 2017 21:06:54 +0200 Message-Id: <20170406190654.6733-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170406185519.5918-1-daniel.vetter@ffwll.ch> References: <20170406185519.5918-1-daniel.vetter@ffwll.ch> Cc: David Airlie , Daniel Vetter , DRI Development , Alex Deucher , Daniel Vetter , Harry Wentland Subject: [Intel-gfx] [PATCH] drm: Take mode_config.mutex in setcrtc ioctl 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-Virus-Scanned: ClamAV using ClamSMTP Legacy drivers insist that we really take all the locks in this path, and the harm in doing so is minimal. v2: Like git add, it exists :( Fixes: 2ceb585a956c ("drm: Add explicit acquire ctx handling around ->set_config") Cc: Harry Wentland Cc: Daniel Vetter Cc: Daniel Vetter Cc: Jani Nikula Cc: Sean Paul Cc: David Airlie Cc: dri-devel@lists.freedesktop.org Cc: Alex Deucher Reported-by: Alex Deucher Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_crtc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index d69e180fc563..5af25ce5bf7c 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -576,6 +576,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, } DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name); + mutex_lock(&crtc->dev->mode_config.mutex); drm_modeset_acquire_init(&ctx, 0); retry: ret = drm_modeset_lock_all_ctx(crtc->dev, &ctx); @@ -721,6 +722,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, } drm_modeset_drop_locks(&ctx); drm_modeset_acquire_fini(&ctx); + mutex_unlock(&crtc->dev->mode_config.mutex); return ret; }