From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BDA43606A325 for ; Fri, 20 Nov 2026 12:57:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=Qjn7BeYh Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EFA011129FA; Fri, 20 Nov 2026 12:57:33 +0000 (UTC) Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 890E01129F2 for ; Fri, 20 Nov 2026 12:57:01 +0000 (UTC) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 6F67A40784; Fri, 20 Nov 2026 12:57:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B355C1F000CF; Fri, 20 Nov 2026 12:57:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1795179421; bh=tb/PLo6e1ZJPDQVfwaHMvga/LNtgEtveh88Vm9eC9Ms=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=Qjn7BeYhrX8KBK+NZTRqNB3+09lu96ateFOAOTLw19gzLfl36Zt2k9vT0Yp568Wo9 1juFeVmH4j8UBUjX1lj4Q4uYlGwHCgUlwdkI1gWKB07HQUnvyV/uEccN+D+u7JZR7a NozAzBzXDJHfNuinX3pJHTeYtB11mqZCbmxCBhMhXHerkUcbyMsQxMe5UOHYxIRSjp 9plLt0TtvPzcGAC+DXETGBgQWD6knTmcCk42A0gis9AzjRaN3OY15YytnvBJMXX2lp 6Xlq7xbnVNgrswKaIvcwOARlj+ado/4CU9m7MB2zqxDlHQLkYcgpN2vJpT0ECRh1DQ R7CoDFI1ZALJQ== From: Maxime Ripard Date: Fri, 20 Nov 2026 13:55:21 +0100 Subject: [PATCH v9 29/42] drm/bridge: display-connector: Implement readout support X-Archived-By: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261120-drm-state-readout-v9-29-a67c2b45b8ec@kernel.org> References: <20261120-drm-state-readout-v9-0-a67c2b45b8ec@kernel.org> In-Reply-To: <20261120-drm-state-readout-v9-0-a67c2b45b8ec@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Jyri Sarha , Tomi Valkeinen Cc: Devarsh Thakkar , dri-devel@lists.freedesktop.org, Maxime Ripard X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=5126; i=mripard@kernel.org; h=from:subject:message-id; bh=DB+8M7x8AACNwILS1p7L7yutUtCF98A4c/aVy2fozoE=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDNkMzvrf9uYIVYQe8eB7eVr5ynrfWRfLb+n8tEz+41az5 scUZo4rHVNZGIQ5GWTFFFmeyISdXt6+uMrBfuUPmDmsTCBDGLg4BWAiRQWMdYYfjCTN9v5+tCDp w6c7ffb/nQr0vG5cd/SdK3WS3b3BW9JJJqUh/9JKJ08R14cmB07eY6yzOTF5V8SZf+dYl906zBn /q9702CrX6TvPBa6cf8vwt7HxHMltWtl/LA79565Zf0nhr3oKAA== 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-Archive: List-Post: List-Help: List-Subscribe: , Sender: "dri-devel" X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 The display-connector bridge is the last bridge in the chain on platforms using drm_bridge_connector, and is responsible for the physical connector interface. Implement the atomic_sro_readout_state hook and wire up the default drm_atomic_helper_bridge_compare_state() as the compare hook. Reviewed-by: Maarten Lankhorst Signed-off-by: Maxime Ripard --- drivers/gpu/drm/bridge/display-connector.c | 75 ++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/drivers/gpu/drm/bridge/display-connector.c b/drivers/gpu/drm/bridge/display-connector.c index eb3412ec30a0..be375f86e038 100644 --- a/drivers/gpu/drm/bridge/display-connector.c +++ b/drivers/gpu/drm/bridge/display-connector.c @@ -12,11 +12,14 @@ #include #include #include #include +#include #include +#include +#include #include #include struct display_connector { struct drm_bridge bridge; @@ -211,10 +214,80 @@ static u32 *display_connector_get_input_bus_fmts(struct drm_bridge *bridge, return prev_bridge->funcs->atomic_get_input_bus_fmts(prev_bridge, prev_bridge_state, crtc_state, conn_state, output_fmt, num_input_fmts); } +/* + * Reconstruct the bridge bus configuration from the previous bridge's + * readout state and the connector's display_info. + * + * During normal atomic check, drm_atomic_bridge_chain_select_bus_fmts() + * and drm_atomic_bridge_propagate_bus_flags() walk the bridge chain to + * negotiate formats and propagate flags. During SRO readout, those + * functions do not run, so each bridge must reconstruct its own state. + * + * The SRO infrastructure traverses bridges from first to last, so the + * previous bridge's state is already available. The input bus + * configuration is taken from the previous bridge's output. The output + * bus format comes from the connector's display_info, since this bridge + * is the last in the chain and acts as a passthrough to the connector. + * Bus flags are also taken from display_info, matching the default + * propagation behavior of drm_atomic_bridge_propagate_bus_flags(). + */ +static int +display_connector_readout_state(struct drm_bridge *bridge, + struct drm_atomic_sro_state *state, + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state) +{ + struct drm_display_info *di = &conn_state->connector->display_info; + struct drm_bridge *prev_bridge __free(drm_bridge_put) = + drm_bridge_get_prev_bridge(bridge); + + /* + * A previous bridge without readout support still gets a + * pristine state in the SRO state, which doesn't hold any + * meaningful bus configuration. Only use the state of bridges + * that were actually read out. + */ + if (prev_bridge && prev_bridge->base.funcs->atomic_sro_readout_state) { + struct drm_private_state *prev_priv_state = + drm_atomic_sro_get_private_obj_state(state, + &prev_bridge->base); + + if (prev_priv_state) { + struct drm_bridge_state *prev_bridge_state = + drm_priv_to_bridge_state(prev_priv_state); + + bridge_state->input_bus_cfg.format = + prev_bridge_state->output_bus_cfg.format; + bridge_state->input_bus_cfg.flags = + prev_bridge_state->output_bus_cfg.flags; + goto out_input; + } + } + + /* + * The previous bridge might not have readout support, so we + * can't treat a missing state as an error. + */ + bridge_state->input_bus_cfg.format = MEDIA_BUS_FMT_FIXED; + bridge_state->input_bus_cfg.flags = di->bus_flags; + +out_input: + + if (di->num_bus_formats && di->bus_formats) + bridge_state->output_bus_cfg.format = di->bus_formats[0]; + else + bridge_state->output_bus_cfg.format = MEDIA_BUS_FMT_FIXED; + + bridge_state->output_bus_cfg.flags = di->bus_flags; + + return 0; +} + static const struct drm_bridge_funcs display_connector_bridge_funcs = { .attach = display_connector_attach, .destroy = display_connector_destroy, .detect = display_connector_bridge_detect, .hpd_enable = display_connector_hpd_enable, @@ -223,10 +296,12 @@ static const struct drm_bridge_funcs display_connector_bridge_funcs = { .atomic_get_output_bus_fmts = display_connector_get_output_bus_fmts, .atomic_get_input_bus_fmts = display_connector_get_input_bus_fmts, .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, .atomic_create_state = drm_atomic_helper_bridge_create_state, + .atomic_sro_readout_state = display_connector_readout_state, + .atomic_sro_compare_state = drm_atomic_helper_bridge_compare_state, }; static irqreturn_t display_connector_hpd_irq(int irq, void *arg) { struct display_connector *conn = arg; -- 2.56.1