From patchwork Thu Aug 6 13:06:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6958681 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 EA41F9F6E2 for ; Thu, 6 Aug 2015 13:06:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 34EE520532 for ; Thu, 6 Aug 2015 13:06:53 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2514E20552 for ; Thu, 6 Aug 2015 13:06:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D4C626EBB1; Thu, 6 Aug 2015 06:06:50 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8B15D6E87C for ; Thu, 6 Aug 2015 06:06:48 -0700 (PDT) Received: by wicgj17 with SMTP id gj17so21822445wic.1 for ; Thu, 06 Aug 2015 06:06:47 -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; bh=0pPSrz6MzQb/NRe3oZ/mMdZm06kxqXL2cOIYtuvA2UU=; b=Sim0SkvqRUhC991sMQqYmThvZaeIVFfCHuINTlJIsPWbHQBUbIveYK8uBLwxWESmZJ Ksbc4/fc9m0OdBqfbX+3I4XbKlGbkjRbdGiqXz+J/bpZ0iFYFtMA8x3nkZ3FhvK3Sryi JQ3mijfykrqZ2/lQEANqMOIPcjuhATf5U8ZuU= 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; bh=0pPSrz6MzQb/NRe3oZ/mMdZm06kxqXL2cOIYtuvA2UU=; b=lCBY4EBA6x/Dj7Gec3KUog9GarwGVdo4ze3BK9+ACXx3sFTdYcfSsffDjy5x6834fi qOOEZX5+ByIutpmH3yOR6uSL9r1iNg71aDe59uoiHXc4YxQ1gf5pF8Va++0wziNVIWx9 tBFWirBA19iTbVr4TCoXv8feQSlcLXjecdSHYBtP+qGmWZJiSqPZ6ZfAYgNDsFsbLRP9 NEZAd3EQdB/WXsl1T/k14A2ZbWpAByZe0r7eiyMV4ockGhAredSdM0ZudC+qnR9Px2tq w5Eudm3qMm4t4HTftMlN2XunZXLIrvHNaUblWVVaMdzObNOe8nt3bJPxy34jfxe6rgjC QkSg== X-Gm-Message-State: ALoCoQlwpSmV2wtvl9LCIbBTglLN8QtI3XKlYqC0oNnw1Zyk6ni555Bfe3lq4mnMOuR7GInfiuid X-Received: by 10.194.82.167 with SMTP id j7mr3127559wjy.123.1438866407146; Thu, 06 Aug 2015 06:06:47 -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 gt10sm3228338wib.20.2015.08.06.06.06.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Aug 2015 06:06:46 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Thu, 6 Aug 2015 15:06:40 +0200 Message-Id: <1438866400-3699-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.0 Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/atomic: Call ww_acquire_done after check phase is complete 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.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 We want to make sure that no one tries to acquire more locks and states, and ww mutexes provide debug facilities for that. So use them. v2: Only call acquire_done when ->atomic_check was successful to avoid falling over an -EDEADLK (spotted by Maarten). Cc: Rob Clark Cc: Maarten Lankhorst Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_atomic.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 422183e7ee7d..750ee96097b9 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1268,6 +1268,9 @@ int drm_atomic_check_only(struct drm_atomic_state *state) } } + if (ret == 0) + ww_acquire_done(&state->acquire_ctx->ww_ctx); + return ret; } EXPORT_SYMBOL(drm_atomic_check_only);