From patchwork Thu Mar 13 12:00:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 14014888 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 D624CC282DE for ; Thu, 13 Mar 2025 12:00:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4BB5E10E870; Thu, 13 Mar 2025 12:00:48 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="NvpVCLn+"; dkim-atps=neutral Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id EF13F10E86F for ; Thu, 13 Mar 2025 12:00:44 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id A02285C5D74; Thu, 13 Mar 2025 11:58:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2C3DC4CEDD; Thu, 13 Mar 2025 12:00:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741867244; bh=EUewhanqsgL3E4pPLl8bCzs5JweSDQRhJsHCwfNO/+s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=NvpVCLn+EICHTmjoc+rC7239hr+En3BknmFbkLXpvNgv6XKPhzOaihjwotOoXiU67 79qqcWIz5ZMgzpO5Vn8VUAmtetddt6u0vjo+Uz9ESQq0rd8hPE+ARKAWqSR9vjpkaz 31xhlmMzqyAbNChi0QSxB1xcgdoKg2FZ2PEcQITl/LNCtWPYH0NfG5if6u1qVf2HJ2 /iZv7/gjcg7MZKd2HseKE0yuQCm+Ep8Q6a7mzywV9snzHHE9Jqr+Kg9CeY6m8Qc5Ac wQp4x3+Kcde4iZue2oJEWYsuMJSNjVVu+C96dw3hhW2g0VASSnGYi+g6wh/8GGWYQm ACbl56d5yv5vA== From: Maxime Ripard Date: Thu, 13 Mar 2025 13:00:05 +0100 Subject: [PATCH v6 11/16] drm/bridge: Introduce drm_bridge_is_atomic() helper MIME-Version: 1.0 Message-Id: <20250313-bridge-connector-v6-11-511c54a604fb@kernel.org> References: <20250313-bridge-connector-v6-0-511c54a604fb@kernel.org> In-Reply-To: <20250313-bridge-connector-v6-0-511c54a604fb@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: Herve Codina , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Maxime Ripard , Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1960; i=mripard@kernel.org; h=from:subject:message-id; bh=EUewhanqsgL3E4pPLl8bCzs5JweSDQRhJsHCwfNO/+s=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOmXThzdK53x/dWzhnIXz3XcNoH6oa4KM9qtZytwyym+X tKsG+jZUcrCIMbFICumyBIjbL4k7tSs151sfPNg5rAygQxh4OIUgJt8gOGvZFmX71cV+U0mBhna Wy022Zw1Pdn5LW79tWXOPY2bbswKYWT4+Yfj1u32uSlynGtepDRP2G+cJHt06qnNu48n1xWf8vr KBQA= 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" We test for whether the bridge is atomic in several places in the source code, so let's consolidate them. Suggested-by: Dmitry Baryshkov Reviewed-by: Dmitry Baryshkov Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_bridge.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index 5bdce9db4475c9699bec11b1e4c0615af028b33d..ef98e21dc593f38a2d3c67b850032ece38bec5e8 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -279,10 +279,15 @@ drm_bridge_atomic_destroy_priv_state(struct drm_private_obj *obj, static const struct drm_private_state_funcs drm_bridge_priv_state_funcs = { .atomic_duplicate_state = drm_bridge_atomic_duplicate_priv_state, .atomic_destroy_state = drm_bridge_atomic_destroy_priv_state, }; +static bool drm_bridge_is_atomic(struct drm_bridge *bridge) +{ + return bridge->funcs->atomic_reset != NULL; +} + /** * drm_bridge_attach - attach the bridge to an encoder's chain * * @encoder: DRM encoder * @bridge: bridge to attach @@ -331,11 +336,11 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge, ret = bridge->funcs->attach(bridge, encoder, flags); if (ret < 0) goto err_reset_bridge; } - if (bridge->funcs->atomic_reset) { + if (drm_bridge_is_atomic(bridge)) { struct drm_bridge_state *state; state = bridge->funcs->atomic_reset(bridge); if (IS_ERR(state)) { ret = PTR_ERR(state); @@ -376,11 +381,11 @@ void drm_bridge_detach(struct drm_bridge *bridge) return; if (WARN_ON(!bridge->dev)) return; - if (bridge->funcs->atomic_reset) + if (drm_bridge_is_atomic(bridge)) drm_atomic_private_obj_fini(&bridge->base); if (bridge->funcs->detach) bridge->funcs->detach(bridge);