From patchwork Wed Dec 21 10:23:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9482829 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 22C8A60487 for ; Wed, 21 Dec 2016 10:23:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1542C28179 for ; Wed, 21 Dec 2016 10:23:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A28A28422; Wed, 21 Dec 2016 10:23:57 +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 B7E4828179 for ; Wed, 21 Dec 2016 10:23:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F414B6EB92; Wed, 21 Dec 2016 10:23:52 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wj0-x241.google.com (mail-wj0-x241.google.com [IPv6:2a00:1450:400c:c01::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 777056E0C6 for ; Wed, 21 Dec 2016 10:23:41 +0000 (UTC) Received: by mail-wj0-x241.google.com with SMTP id kp2so31386621wjc.0 for ; Wed, 21 Dec 2016 02:23:41 -0800 (PST) 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=Xs41j4GfAi3yikco2bNT8zXB/SoL/Je4QUq0AdfczDQ=; b=GXM4628gxBbom0/P2SpSDW+g+E8/zP9jD56ixc6KFdHxV7vnLdhodawNmigRn7THqx Oe6P2/MnQb0P9RfStYoQcAKYOJkbM1MEribILTguDz3AK+dwnYvJ1/z4H8kFZLgkgj2X ih039dXCNguq+FJcg/m/6tTPx+UOI6oU74bTk= 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=Xs41j4GfAi3yikco2bNT8zXB/SoL/Je4QUq0AdfczDQ=; b=VZ/Cb0wK7/gGbIdIFTgqM/lFv4ymUOXK8MrYwGDQvECqynAhBddWgmRwoZ++2KOvg3 KHN5jK+BHQYq8vnRyk1xGPCGzHr8iF7pfCs1xdHtGdWH/BRRBq9/iJGyQR26QV25H7Cs b+3kg3zKGPY4it5/1ILMXXrc1BVGaCMCAlo/l6v5T2Bc2v0Tx9hxFoRMYjfbUzY4X+GN HfSxPC/iivoGvPTgK9s4/pjqMIvI84gqiU/QD3zmgu9Dv82/Wb+dxSus5zwkJv1Hj1QG dpanSbyVo3cppLHLQ+BpEI4ejjW3HHrKlZ0Jpgw0VV35con4sRAGJ25Jy3w11YQhtosZ TuIg== X-Gm-Message-State: AIkVDXI2VCZlzLrHgP1UYZXLSZW3pHgTQB8dFpDX2Ix5KIZ4x6Jlw7O9JJgHBdt20P1Hdg== X-Received: by 10.194.122.136 with SMTP id ls8mr2526510wjb.73.1482315819743; Wed, 21 Dec 2016 02:23:39 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:56c9:0:decc:6e78:7e96:b452]) by smtp.gmail.com with ESMTPSA id bf2sm29689221wjc.48.2016.12.21.02.23.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Dec 2016 02:23:39 -0800 (PST) From: Daniel Vetter To: DRI Development Date: Wed, 21 Dec 2016 11:23:31 +0100 Message-Id: <20161221102331.31033-2-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161221102331.31033-1-daniel.vetter@ffwll.ch> References: <20161221102331.31033-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Subject: [Intel-gfx] [PATCH 2/2] drm: Add kernel-doc for drm_crtc_commit_get/put 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 I was lazy, rectify that! Also align with drm_atomic_state_get/put for ocd. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_atomic.c | 9 ++------- include/drm/drm_atomic.h | 21 ++++++++++++++++++++- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index b1b54011a92c..26a4cfdf7777 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -35,19 +35,14 @@ #include "drm_crtc_internal.h" -static void crtc_commit_free(struct kref *kref) +void __drm_crtc_commit_free(struct kref *kref) { struct drm_crtc_commit *commit = container_of(kref, struct drm_crtc_commit, ref); kfree(commit); } - -void drm_crtc_commit_put(struct drm_crtc_commit *commit) -{ - kref_put(&commit->ref, crtc_commit_free); -} -EXPORT_SYMBOL(drm_crtc_commit_put); +EXPORT_SYMBOL(__drm_crtc_commit_free); /** * drm_atomic_state_default_release - diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index 91b18bd7cb50..e8ed6f707497 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -199,12 +199,31 @@ struct drm_atomic_state { struct work_struct commit_work; }; -void drm_crtc_commit_put(struct drm_crtc_commit *commit); +void __drm_crtc_commit_free(struct kref *kref); + +/** + * drm_crtc_commit_get - acquire a reference to the CRTC commit + * @commit: CRTC commit + * + * Increases the reference of @commit. + */ static inline void drm_crtc_commit_get(struct drm_crtc_commit *commit) { kref_get(&commit->ref); } +/** + * drm_crtc_commit_put - release a reference to the CRTC commmit + * @commit: CRTC commit + * + * This releases a reference to @commit which is freed after removing the + * final reference. No locking required and callable from any context. + */ +void drm_crtc_commit_put(struct drm_crtc_commit *commit) +{ + kref_put(&commit->ref, __drm_crtc_commit_free); +} + struct drm_atomic_state * __must_check drm_atomic_state_alloc(struct drm_device *dev); void drm_atomic_state_clear(struct drm_atomic_state *state);