From patchwork Tue Feb 25 16:43:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 13990292 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 E8DE5C021B2 for ; Tue, 25 Feb 2025 16:44:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C3FE710E771; Tue, 25 Feb 2025 16:44:35 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="DBDctgLe"; 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 8772D10E752 for ; Tue, 25 Feb 2025 16:44:33 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 16AF95C70F7; Tue, 25 Feb 2025 16:43:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 711E1C4CEED; Tue, 25 Feb 2025 16:44:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740501872; bh=/qYTFXPW6zCODmKFJgfLNKuZkSKrl+xBMfwcF1h+tSw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=DBDctgLePdsZyZuIagtu1Y7G66OR3UerhOnAnOxk8LfHYQtsGqXvTzGCOkgOF1kcT PRWoveFJYMOuAyS3HzTBpCqNt/q9lyPlPgGgI4vECd29giGul5q3FRgg/bHciKSe/t 5C++mT4gNFjiYF5wcuiaKsvKoewGSF6heUrozbKbE/HpZvGH2bk6gL/uysvdLVU9En 7Ze8mmIz8X8c6rTZMBzF4uLro6IklOGKcmEXpqgMqd5sBoDY2RbvX7/sR778TmrtkD //VCFXqiAePXzJm1FuYFEQ65h8Sy1MYHg9AF9HDJErwbJFhlVh3SYs/CydAhu8ddMr K/fi26lI/pEXA== From: Maxime Ripard Date: Tue, 25 Feb 2025 17:43:58 +0100 Subject: [PATCH v4 10/15] drm/bridge: Introduce drm_bridge_is_atomic() helper MIME-Version: 1.0 Message-Id: <20250225-bridge-connector-v4-10-7ecb07b09cad@kernel.org> References: <20250225-bridge-connector-v4-0-7ecb07b09cad@kernel.org> In-Reply-To: <20250225-bridge-connector-v4-0-7ecb07b09cad@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=/qYTFXPW6zCODmKFJgfLNKuZkSKrl+xBMfwcF1h+tSw=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDOl7P/vpe3o7RaoXp2ckuZf8fhN5bauF/wGVp5+WLP1wP XzflqnFHVNZGIQ5GWTFFFmeyISdXt6+uMrBfuUPmDmsTCBDGLg4BWAibEqMtSJmv16FW+9srpqb +GTB1TdRvA+exn1+4ifONNVcJsAld3/ISz3jAOWJdjVCBf9v5UXdZmx497jjoUzqhTyW3zv5y+S l3+1KvnTyaebjrMCLJ7/YXUtOvcaa63PcPqHa7Wbr47cL9l0FAA== 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 ca894531a2042fc9296c40a1f51a6cdea6e97ed7..4d6a72f8b7d1bd1641d434f9fedbc2f087e249ac 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);