From patchwork Wed Aug 5 13:08:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6948811 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 344B0C05AD for ; Wed, 5 Aug 2015 13:08:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 619E520481 for ; Wed, 5 Aug 2015 13:08:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 0B5F920489 for ; Wed, 5 Aug 2015 13:08:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 852BF6E70B; Wed, 5 Aug 2015 06:08:49 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by gabe.freedesktop.org (Postfix) with ESMTPS id B3C196E7B3 for ; Wed, 5 Aug 2015 06:08:48 -0700 (PDT) Received: by wibhh20 with SMTP id hh20so23460448wib.0 for ; Wed, 05 Aug 2015 06:08: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=lcmmfqIApvnceHjqfiFTiqK6JFwAWr0z0z+mXvD9pWo=; b=jJVyFc0FEigx7PGGLei+FLaOrIoHMBAS39j/XXUBt0yTlWXrl1xQRswbAp955g1v2+ y7ZyR9vZ3rHKZol3J90fvLeJ3qJiY+zBuVusI5esmVhyl25tN+32ZU6xM5QIdOotu3Sv d3YDmlLTnbacX72DBk9a8SdfIZ6ZSoBePtGvA= 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=lcmmfqIApvnceHjqfiFTiqK6JFwAWr0z0z+mXvD9pWo=; b=dB0QfpkUPF0ww53yp/xmkiVenXAtEmIYhbuR8kVbVrYo96jOBt0s49Mcv/vEPqqMXV fn5hluHprgTNm0IMcHvvdS0/gVFLG2t5xZka/S7MZmRxl6UHQYR3mPZBLlCn8Adc1G0J WvZpEbfR0PPHhRFIkPPteMPJOuHQSkFEgpg+RS8s4G3Xe7ekB8oJZ3thk6ANrlU9SHFz A9IHm/5rPKVQHO3WM9mk8arjTBxl1VkDUswP4dhkcP7wCxjNGP7ZURmLa9QZn6RXhVXi n9eLvepQrVL+rIdcB5mY9jHeALizelYKPw4nd4LyootT6OOunudtLoIrPqb6GChFoGQt vi3w== X-Gm-Message-State: ALoCoQl55DNu3KuDHSHFpnlYZ2ememiuNvSh08qT9MxAszLQiGk1HjtcP3H/jBnIG1zDgddjdJku X-Received: by 10.180.83.137 with SMTP id q9mr10567350wiy.68.1438780126910; Wed, 05 Aug 2015 06:08:46 -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 l13sm4090771wjr.18.2015.08.05.06.08.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Aug 2015 06:08:46 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/atomic: Call ww_acquire_done after check phase is complete Date: Wed, 5 Aug 2015 15:08:39 +0200 Message-Id: <1438780119-30493-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.0 Cc: Daniel Vetter , Intel Graphics Development , 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-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. Cc: Rob Clark Cc: Maarten Lankhorst Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_atomic.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 422183e7ee7d..5ea609f270ea 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1268,6 +1268,8 @@ int drm_atomic_check_only(struct drm_atomic_state *state) } } + ww_acquire_done(&state->acquire_ctx->ww_ctx); + return ret; } EXPORT_SYMBOL(drm_atomic_check_only);