From patchwork Thu Feb 13 14:43:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 13973397 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9DCD4C0219D for ; Thu, 13 Feb 2025 14:44:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2245610EAE1; Thu, 13 Feb 2025 14:44:47 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="FtVQUjsR"; dkim-atps=neutral Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by gabe.freedesktop.org (Postfix) with ESMTPS id 068E210EAE1 for ; Thu, 13 Feb 2025 14:44:46 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id CD8AAA4202C; Thu, 13 Feb 2025 14:42:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78C79C4CED1; Thu, 13 Feb 2025 14:44:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739457884; bh=bLQlvUPK5MwSbxTg0psAGWYR0TzhNMipULajeO64aDY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=FtVQUjsRz4vK1aEKmVob8onLSENcSZAqKHPnaEaJxEVuMPLhyyWJ3tuhzwunOSlS8 Zg53bP6QVFkt2UaDj4bdve6VbCZLuoQ299ZHpcEaryVkbNsWUUQeMhxMDG//M+DV5n 5Dkh30aShTAno4UwcxktCJJu5NMAH92686Qal2+WYii+GzljpD8zqAT/Y79mKhVdOt 5ReY0RaVft2j6oUm4dn+TxRpey9K2VQn6PkAbdubn7lv0jE0L39nNvdjZMM+Xbica6 NHIrvo+SlgbxQn2939Y49x1w+sxnc/T+d8MoDYO6uuF0sJTcSejJ/SqdpLD+Hr33Tv a6v5xoQiLXzXA== From: Maxime Ripard Date: Thu, 13 Feb 2025 15:43:37 +0100 Subject: [PATCH v3 18/37] drm/bridge: Change parameter name of drm_atomic_bridge_chain_pre_enable() MIME-Version: 1.0 Message-Id: <20250213-bridge-connector-v3-18-e71598f49c8f@kernel.org> References: <20250213-bridge-connector-v3-0-e71598f49c8f@kernel.org> In-Reply-To: <20250213-bridge-connector-v3-0-e71598f49c8f@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Douglas Anderson Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Maxime Ripard X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2872; i=mripard@kernel.org; h=from:subject:message-id; bh=bLQlvUPK5MwSbxTg0psAGWYR0TzhNMipULajeO64aDY=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDOnrWOUEfs7o81DqlpR98iFjtm2eX7LLB0+J9R/2BHK99 RQJePq2YyoLgzAng6yYIssTmbDTy9sXVznYr/wBM4eVCWQIAxenAEykU42xzppx9+wjhQK82Y8q fviKXD3S4/jf9J2Y4arWIx8l5/scNz7PufXWgeIou/sSTxpVIgVMGOurvL8xn73G1CCoe3RfIa+ AhpZe587iEyEP4z9XNxv6NBXaXL350ulPcLp8TqVTWLZBBQA= X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" drm_atomic_bridge_chain_pre_enable() enables all bridges affected by a new commit. It takes the drm_atomic_state being committed as a parameter. However, that parameter name is called (and documented) as old_state, which is pretty confusing. Let's rename that variable as state. Signed-off-by: Maxime Ripard Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/drm_bridge.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index b63ec3d0b285949ebe75f28b526e2833d0e6a850..41bb3700ca7b6f267a75481ae942b9357b5777c9 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -676,23 +676,23 @@ void drm_atomic_bridge_chain_post_disable(struct drm_bridge *bridge, } } EXPORT_SYMBOL(drm_atomic_bridge_chain_post_disable); static void drm_atomic_bridge_call_pre_enable(struct drm_bridge *bridge, - struct drm_atomic_state *old_state) + struct drm_atomic_state *state) { - if (old_state && bridge->funcs->atomic_pre_enable) - bridge->funcs->atomic_pre_enable(bridge, old_state); + if (state && bridge->funcs->atomic_pre_enable) + bridge->funcs->atomic_pre_enable(bridge, state); else if (bridge->funcs->pre_enable) bridge->funcs->pre_enable(bridge); } /** * drm_atomic_bridge_chain_pre_enable - prepares for enabling all bridges in * the encoder chain * @bridge: bridge control structure - * @old_state: old atomic state + * @state: atomic state being committed * * Calls &drm_bridge_funcs.atomic_pre_enable (falls back on * &drm_bridge_funcs.pre_enable) op for all the bridges in the encoder chain, * starting from the last bridge to the first. These are called before calling * &drm_encoder_helper_funcs.atomic_enable @@ -708,11 +708,11 @@ static void drm_atomic_bridge_call_pre_enable(struct drm_bridge *bridge, * Bridge C, Bridge D, Bridge E, Bridge A, Bridge B. * * Note: the bridge passed should be the one closest to the encoder */ void drm_atomic_bridge_chain_pre_enable(struct drm_bridge *bridge, - struct drm_atomic_state *old_state) + struct drm_atomic_state *state) { struct drm_encoder *encoder; struct drm_bridge *iter, *next, *limit; if (!bridge) @@ -747,15 +747,15 @@ void drm_atomic_bridge_chain_pre_enable(struct drm_bridge *bridge, /* At the first bridge to request prev * bridges called first. */ break; - drm_atomic_bridge_call_pre_enable(next, old_state); + drm_atomic_bridge_call_pre_enable(next, state); } } - drm_atomic_bridge_call_pre_enable(iter, old_state); + drm_atomic_bridge_call_pre_enable(iter, state); if (iter->pre_enable_prev_first) /* Jump all bridges that we have already pre_enabled */ iter = limit;