From patchwork Wed Oct 29 09:12:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 5185551 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BEE7F9F430 for ; Wed, 29 Oct 2014 09:12:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E6364201F2 for ; Wed, 29 Oct 2014 09:12:03 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 114CC2017D for ; Wed, 29 Oct 2014 09:12:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4A0C76E4D9; Wed, 29 Oct 2014 02:12:02 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by gabe.freedesktop.org (Postfix) with ESMTP id A8A656E4E1 for ; Wed, 29 Oct 2014 02:11:59 -0700 (PDT) Received: by mail-wi0-f174.google.com with SMTP id d1so1058698wiv.13 for ; Wed, 29 Oct 2014 02:11:58 -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=I6WThhgOE2T2ut8/mbvipFY2X/ZIgqArBRtO6nP+y1E=; b=kWLnqinGJL6j06klxBReHiZ5MbErMJFVD3M5Q0Aoz9qPqs3gWfOSgUPbskbBZM0Ta1 lgIRrF5b4EIzKlt00jnu3k9jhGkq5ZjH2vwUUYHTr0JaoFwqXBvqgkLZ+ypYKE1dnGST qgpq9NbBQWJHtWd90kUXrPpzvPLwGQcZ+RTOs= 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=I6WThhgOE2T2ut8/mbvipFY2X/ZIgqArBRtO6nP+y1E=; b=hP3JCm3eKtTUwQ5Y3TKjaUq6lJO22fiHvPR8krN2qmstLqsd2kXkj3QIVMEgTEbZlF M/RLhH/+HocoN76IWPcZ8IqMe9m9cj51q3NPAce28Q3t8K5ZlSQ01rDqubMAKt2XuarT 64r31fKpUuTQzSgyGGMYp7KZ4ISaN0nD84seyzvqMssVCaGzsC8+C+2hLrJ6HlPR5rbe qPfB1rz2nnWYktwF+oHvTrKy/mwoVGBWir8lDvO9AN8CWbpEI2OxyaC1n7RMxZ0l7G6A cSOYvk9813/RiFdgsqT79RPDsYXh55fcyndts6MM0fYzDjSz9N1T1t5yP1+WVYckLyyH +V8Q== X-Gm-Message-State: ALoCoQlmW1MZ+Qzf33g4RkaLuypVQyFj4H1/qNPTuUrK/vmfMX9wRJh3NntCzfLWn9+m8jdPFHpX X-Received: by 10.180.73.19 with SMTP id h19mr33921231wiv.3.1414573918864; Wed, 29 Oct 2014 02:11:58 -0700 (PDT) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id r10sm936181wiy.19.2014.10.29.02.11.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Oct 2014 02:11:57 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development , DRI Development Subject: [PATCH 3/3] drm/modeset_lock: document trylock_only in kerneldoc Date: Wed, 29 Oct 2014 10:12:03 +0100 Message-Id: <1414573923-27326-3-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1414573923-27326-1-git-send-email-daniel.vetter@ffwll.ch> References: <1414573923-27326-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , 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.7 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 I've forgotten to do this in: commit cb597bb3a2fbfc871cc1c703fb330d247bd21394 Author: Daniel Vetter Date: Sun Jul 27 19:09:33 2014 +0200 drm: trylock modest locking for fbdev panics Oops, fix this asap. In my defense kerneldoc is really awful and there's no way it can pick up structured comments per struct member. Which means we need both since people won't scroll up even a few lines. Signed-off-by: Daniel Vetter --- include/drm/drm_modeset_lock.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/drm/drm_modeset_lock.h b/include/drm/drm_modeset_lock.h index 75a5c45e21c7..28931a23d96c 100644 --- a/include/drm/drm_modeset_lock.h +++ b/include/drm/drm_modeset_lock.h @@ -33,6 +33,7 @@ struct drm_modeset_lock; * @ww_ctx: base acquire ctx * @contended: used internally for -EDEADLK handling * @locked: list of held locks + * @trylock_only: trylock mode used in atomic contexts/panic notifiers * * Each thread competing for a set of locks must use one acquire * ctx. And if any lock fxn returns -EDEADLK, it must backoff and