From nobody Wed Feb 5 19:57:01 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C93E2144BF for ; Tue, 4 Feb 2025 14:58:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738681092; cv=none; b=pMuNlss9CzMY3JaCtu+bPWdkG9fHgiztqsQMUBwoIFkzk6EvzJCkL74UbAPS5ItGO9JMzNYvH9ZT5/taeUmiQyHkFxZMBMcsqw7pffGuoth3QOdWL2YdOS2ZYdlAbP8MjiZ6kPTAUVlzl9ZDWcXW11l1IRp5eZE6oWNNn1ujgCQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738681092; c=relaxed/simple; bh=mDOqPd56s+zFlQzSCHI6zhIuN33gmrKXRWkYLH6mYI0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ovCwIqlx6IoRElWsgefGLKywJOvMaN66OkQDL3dw+kPzlDcoxJ+4+ahT+/ngb4zGIynq7B5DoOXe4DCIshQMiHapWnIQCs3G0v1my87Ox/iAhajksgvWH2T89IiDMGK3cw6qzJ9zt79XHJULiILhPIrPZUAWIBGnpBy+ECaGmHU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XrQTLjZw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XrQTLjZw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B972C4CEE2; Tue, 4 Feb 2025 14:58:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738681092; bh=mDOqPd56s+zFlQzSCHI6zhIuN33gmrKXRWkYLH6mYI0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=XrQTLjZwXgTnn6MWSPPpsxlKl3D4Kv1nLfIOF/fJjY3aIcSJRFLAMik1SlhOBwW/s 4LhdVgcihyNJBautuvBuTrorGBRZ4ZeUFFKSfdweZ0T0oxT/VaUfZwC+tV8Mv/oSME 0u0boseSVfncFHCLyMIz+h+zTm7Z10icyg+9gOl+B7gtdBEhQmmyHP/SbznORAh1To IhHjFSRPrlJ2M8foXV4+uzIFBhQK9sjsffcV/ga7sUiSF1BSc7Q1oi2sy+Agdsp23I V9g4n01OWo1YSwDYahQRLEn0Cfo7O5mJJ2PgeMmrBm0nSaLdwW1rp3ewjQw0w0qHbt fRJYS4AJ4vwxg== From: Maxime Ripard Date: Tue, 04 Feb 2025 15:57:30 +0100 Subject: [PATCH v2 02/35] drm/bridge: Pass full state to atomic_pre_enable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250204-bridge-connector-v2-2-35dd6c834e08@kernel.org> References: <20250204-bridge-connector-v2-0-35dd6c834e08@kernel.org> In-Reply-To: <20250204-bridge-connector-v2-0-35dd6c834e08@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=17029; i=mripard@kernel.org; h=from:subject:message-id; bh=mDOqPd56s+zFlQzSCHI6zhIuN33gmrKXRWkYLH6mYI0=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDOmLtF6ylygLdE8WqmL5+7uRO7K3pS3nSwNf450ZnBbzL M5sXDO/YyoLgzAng6yYIssTmbDTy9sXVznYr/wBM4eVCWQIAxenAEwkyISxTrnBro0h/xdH2+Hm bWmdP1coR/8WkAo6GzGxYF8629pyzjMeC5SnFThu+dJt5GzftVWesWHh1XPPTv3ctvp5xSeTbQ7 NHQ7fZS4IGL8o0pm4VnpT6Jete0KOVIbU+9+Rrty4zE6WIxUA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D It's pretty inconvenient to access the full atomic state from drm_bridges, so let's change the atomic_pre_enable hook prototype to pass it directly. Signed-off-by: Maxime Ripard Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 6 ++---- drivers/gpu/drm/bridge/chipone-icn6211.c | 2 +- drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c | 7 +++---- drivers/gpu/drm/bridge/ite-it6505.c | 2 +- drivers/gpu/drm/bridge/lontium-lt9611.c | 2 +- drivers/gpu/drm/bridge/panel.c | 3 +-- drivers/gpu/drm/bridge/parade-ps8640.c | 2 +- drivers/gpu/drm/bridge/samsung-dsim.c | 2 +- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 2 +- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c | 2 +- drivers/gpu/drm/bridge/tc358762.c | 3 ++- drivers/gpu/drm/bridge/ti-dlpc3433.c | 2 +- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 3 +-- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 2 +- drivers/gpu/drm/drm_bridge.c | 15 +++------------ drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +- drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +- drivers/gpu/drm/vc4/vc4_dsi.c | 3 +-- include/drm/drm_bridge.h | 2 +- 19 files changed, 25 insertions(+), 39 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/g= pu/drm/bridge/analogix/analogix_dp_core.c index bfa88409a7ff0fea8f6f8852b428bee8f2c729bd..e097d97fb7d9f1523ec2162c2a7= a7df104fcaa99 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1195,15 +1195,13 @@ struct drm_crtc *analogix_dp_get_new_crtc(struct an= alogix_dp_device *dp, return NULL; =20 return conn_state->crtc; } =20 -static void -analogix_dp_bridge_atomic_pre_enable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) +static void analogix_dp_bridge_atomic_pre_enable(struct drm_bridge *bridge, + struct drm_atomic_state *old_state) { - struct drm_atomic_state *old_state =3D old_bridge_state->base.state; struct analogix_dp_device *dp =3D bridge->driver_private; struct drm_crtc *crtc; struct drm_crtc_state *old_crtc_state; int ret; =20 diff --git a/drivers/gpu/drm/bridge/chipone-icn6211.c b/drivers/gpu/drm/bri= dge/chipone-icn6211.c index d47703559b0dec13fa4478d90ca29be2e899637a..7a009ab57f9ec8e944d1410373a= c9e06db12a815 100644 --- a/drivers/gpu/drm/bridge/chipone-icn6211.c +++ b/drivers/gpu/drm/bridge/chipone-icn6211.c @@ -443,11 +443,11 @@ static void chipone_atomic_enable(struct drm_bridge *= bridge, =20 usleep_range(10000, 11000); } =20 static void chipone_atomic_pre_enable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) + struct drm_atomic_state *state) { struct chipone *icn =3D bridge_to_chipone(bridge); int ret; =20 if (icn->vdd1) { diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c b/drivers/gpu/drm/bri= dge/imx/imx8qxp-ldb.c index 7bce2305d676714cdec7ce085cb53b25ce42f8e7..009c7fcb3d595d7bfabde298511= fde89a85dc890 100644 --- a/drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c +++ b/drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c @@ -201,13 +201,12 @@ imx8qxp_ldb_bridge_mode_set(struct drm_bridge *bridge, =20 if (is_split && companion) companion->funcs->mode_set(companion, mode, adjusted_mode); } =20 -static void -imx8qxp_ldb_bridge_atomic_pre_enable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) +static void imx8qxp_ldb_bridge_atomic_pre_enable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { struct ldb_channel *ldb_ch =3D bridge->driver_private; struct ldb *ldb =3D ldb_ch->ldb; struct imx8qxp_ldb *imx8qxp_ldb =3D base_to_imx8qxp_ldb(ldb); struct drm_bridge *companion =3D imx8qxp_ldb->companion; @@ -215,11 +214,11 @@ imx8qxp_ldb_bridge_atomic_pre_enable(struct drm_bridg= e *bridge, =20 clk_prepare_enable(imx8qxp_ldb->clk_pixel); clk_prepare_enable(imx8qxp_ldb->clk_bypass); =20 if (is_split && companion) - companion->funcs->atomic_pre_enable(companion, old_bridge_state); + companion->funcs->atomic_pre_enable(companion, state); } =20 static void imx8qxp_ldb_bridge_atomic_enable(struct drm_bridge *bridge, struct drm_bridge_state *old_bridge_state) diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/i= te-it6505.c index 88ef76a37fe6accacdd343839ff2569b31b18ceb..b20cec3f961052c6e8861a31ca3= 7160f77fe7c16 100644 --- a/drivers/gpu/drm/bridge/ite-it6505.c +++ b/drivers/gpu/drm/bridge/ite-it6505.c @@ -3251,11 +3251,11 @@ static void it6505_bridge_atomic_disable(struct drm= _bridge *bridge, it6505_video_disable(it6505); } } =20 static void it6505_bridge_atomic_pre_enable(struct drm_bridge *bridge, - struct drm_bridge_state *old_state) + struct drm_atomic_state *state) { struct it6505 *it6505 =3D bridge_to_it6505(bridge); struct device *dev =3D it6505->dev; =20 DRM_DEV_DEBUG_DRIVER(dev, "start"); diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/brid= ge/lontium-lt9611.c index e650cd83fc8d880012edb8a85c69b2f1d378f64c..5d3bbfeaf2299e2425e0079cff0= 805b37180351b 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9611.c +++ b/drivers/gpu/drm/bridge/lontium-lt9611.c @@ -765,11 +765,11 @@ static enum drm_mode_status lt9611_bridge_mode_valid(= struct drm_bridge *bridge, =20 return MODE_OK; } =20 static void lt9611_bridge_atomic_pre_enable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) + struct drm_atomic_state *state) { struct lt9611 *lt9611 =3D bridge_to_lt9611(bridge); static const struct reg_sequence reg_cfg[] =3D { { 0x8102, 0x12 }, { 0x8123, 0x40 }, diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c index 6e88339dec0f5faee690b7c53e8dcd0f1ee2281c..1dbe1c2139879c8c8b6ffa150bc= f57fcad2af964 100644 --- a/drivers/gpu/drm/bridge/panel.c +++ b/drivers/gpu/drm/bridge/panel.c @@ -107,14 +107,13 @@ static void panel_bridge_detach(struct drm_bridge *br= idge) if (connector->dev) drm_connector_cleanup(connector); } =20 static void panel_bridge_atomic_pre_enable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) + struct drm_atomic_state *atomic_state) { struct panel_bridge *panel_bridge =3D drm_bridge_to_panel_bridge(bridge); - struct drm_atomic_state *atomic_state =3D old_bridge_state->base.state; struct drm_encoder *encoder =3D bridge->encoder; struct drm_crtc *crtc; struct drm_crtc_state *old_crtc_state; =20 crtc =3D drm_atomic_get_new_crtc_for_encoder(atomic_state, encoder); diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridg= e/parade-ps8640.c index 14d4dcf239da835955f1d594579dd165288bd63f..b9d803cf88041171a485cd3e15d= 6d5e81a4f873b 100644 --- a/drivers/gpu/drm/bridge/parade-ps8640.c +++ b/drivers/gpu/drm/bridge/parade-ps8640.c @@ -436,11 +436,11 @@ static const struct dev_pm_ops ps8640_pm_ops =3D { SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume) }; =20 static void ps8640_atomic_pre_enable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) + struct drm_atomic_state *state) { struct ps8640 *ps_bridge =3D bridge_to_ps8640(bridge); struct regmap *map =3D ps_bridge->regmap[PAGE2_TOP_CNTL]; struct device *dev =3D &ps_bridge->page[PAGE0_DP_CNTL]->dev; int ret; diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge= /samsung-dsim.c index f8b4fb8357659018ec0db65374ee5d05330639ae..415ce14e747dfca0c5395e18f11= 95733e17616da 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1455,11 +1455,11 @@ static int samsung_dsim_init(struct samsung_dsim *d= si) =20 return 0; } =20 static void samsung_dsim_atomic_pre_enable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) + struct drm_atomic_state *state) { struct samsung_dsim *dsi =3D bridge_to_dsi(bridge); int ret; =20 if (dsi->state & DSIM_STATE_ENABLED) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/dr= m/bridge/synopsys/dw-mipi-dsi.c index 0fb02e4e7f4e5fcf1ad0b606b1485ab05ceb53f8..9731a6b45a52b54fdf910a3cc84= d8f97b0c37c91 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c @@ -1020,11 +1020,11 @@ static void dw_mipi_dsi_mode_set(struct dw_mipi_dsi= *dsi, if (phy_ops->power_on) phy_ops->power_on(dsi->plat_data->priv_data); } =20 static void dw_mipi_dsi_bridge_atomic_pre_enable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) + struct drm_atomic_state *state) { struct dw_mipi_dsi *dsi =3D bridge_to_dsi(bridge); =20 /* Power up the dsi ctl into a command mode */ dw_mipi_dsi_mode_set(dsi, &dsi->mode); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c b/drivers/gpu/d= rm/bridge/synopsys/dw-mipi-dsi2.c index d7569bf2d9c3ef1f22ac07c95d112d1c62dd67a1..194ac6e192f4c2a89048e241da7= b7d0e2db75149 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c @@ -819,11 +819,11 @@ static void dw_mipi_dsi2_mode_set(struct dw_mipi_dsi2= *dsi2, =20 dw_mipi_dsi2_ipi_set(dsi2); } =20 static void dw_mipi_dsi2_bridge_atomic_pre_enable(struct drm_bridge *bridg= e, - struct drm_bridge_state *old_bridge_state) + struct drm_atomic_state *state) { struct dw_mipi_dsi2 *dsi2 =3D bridge_to_dsi2(bridge); =20 /* Power up the dsi ctl into a command mode */ dw_mipi_dsi2_mode_set(dsi2, &dsi2->mode); diff --git a/drivers/gpu/drm/bridge/tc358762.c b/drivers/gpu/drm/bridge/tc3= 58762.c index 46198af9eebbf8cced7b9b4ad628126f144c25dd..aacd45d1667b28079b7d3a05ccb= faa6cd3859c7a 100644 --- a/drivers/gpu/drm/bridge/tc358762.c +++ b/drivers/gpu/drm/bridge/tc358762.c @@ -169,11 +169,12 @@ static void tc358762_post_disable(struct drm_bridge *= bridge, struct drm_bridge_s ret =3D regulator_disable(ctx->regulator); if (ret < 0) dev_err(ctx->dev, "error disabling regulators (%d)\n", ret); } =20 -static void tc358762_pre_enable(struct drm_bridge *bridge, struct drm_brid= ge_state *state) +static void tc358762_pre_enable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { struct tc358762 *ctx =3D bridge_to_tc358762(bridge); int ret; =20 ret =3D regulator_enable(ctx->regulator); diff --git a/drivers/gpu/drm/bridge/ti-dlpc3433.c b/drivers/gpu/drm/bridge/= ti-dlpc3433.c index eaec70fa42b6213df75b9a9ee581a61c116acb3c..c513cd1902048d52088b946691d= b8a1aa24a5a32 100644 --- a/drivers/gpu/drm/bridge/ti-dlpc3433.c +++ b/drivers/gpu/drm/bridge/ti-dlpc3433.c @@ -168,11 +168,11 @@ static void dlpc_atomic_enable(struct drm_bridge *bri= dge, =20 msleep(10); } =20 static void dlpc_atomic_pre_enable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) + struct drm_atomic_state *state) { struct dlpc *dlpc =3D bridge_to_dlpc(bridge); int ret; =20 gpiod_set_value(dlpc->enable_gpio, 1); diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi83.c b/drivers/gpu/drm/bridge= /ti-sn65dsi83.c index 336380114eea901551c94d62234d4d3df5d38443..d56511d50471e686372e7df9b9d= 37bfffdffc969 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi83.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi83.c @@ -362,14 +362,13 @@ static u8 sn65dsi83_get_dsi_div(struct sn65dsi83 *ctx) =20 return dsi_div - 1; } =20 static void sn65dsi83_atomic_pre_enable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) + struct drm_atomic_state *state) { struct sn65dsi83 *ctx =3D bridge_to_sn65dsi83(bridge); - struct drm_atomic_state *state =3D old_bridge_state->base.state; const struct drm_bridge_state *bridge_state; const struct drm_crtc_state *crtc_state; const struct drm_display_mode *mode; struct drm_connector *connector; struct drm_crtc *crtc; diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge= /ti-sn65dsi86.c index b3d617505dda7d22b38c000fb79de46376adf3f1..18a7258d5a9aaf43c4cacf2c7a3= 29c3debe97916 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c @@ -1163,11 +1163,11 @@ static void ti_sn_bridge_atomic_enable(struct drm_b= ridge *bridge, regmap_update_bits(pdata->regmap, SN_ENH_FRAME_REG, VSTREAM_ENABLE, VSTREAM_ENABLE); } =20 static void ti_sn_bridge_atomic_pre_enable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) + struct drm_atomic_state *state) { struct ti_sn65dsi86 *pdata =3D bridge_to_ti_sn65dsi86(bridge); =20 pm_runtime_get_sync(pdata->dev); =20 diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index c6af46dd02bfa9e15b59e4c460debdd7fd84be44..28ed26aaef2de51705b06aab313= 49ed068862bd4 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -692,23 +692,14 @@ void drm_atomic_bridge_chain_post_disable(struct drm_= bridge *bridge, EXPORT_SYMBOL(drm_atomic_bridge_chain_post_disable); =20 static void drm_atomic_bridge_call_pre_enable(struct drm_bridge *bridge, struct drm_atomic_state *old_state) { - if (old_state && bridge->funcs->atomic_pre_enable) { - struct drm_bridge_state *old_bridge_state; - - old_bridge_state =3D - drm_atomic_get_old_bridge_state(old_state, - bridge); - if (WARN_ON(!old_bridge_state)) - return; - - bridge->funcs->atomic_pre_enable(bridge, old_bridge_state); - } else if (bridge->funcs->pre_enable) { + if (old_state && bridge->funcs->atomic_pre_enable) + bridge->funcs->atomic_pre_enable(bridge, old_state); + else if (bridge->funcs->pre_enable) bridge->funcs->pre_enable(bridge); - } } =20 /** * drm_atomic_bridge_chain_pre_enable - prepares for enabling all bridges = in * the encoder chain diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/= mtk_dsi.c index e61b9bc68e9a362a7ade29188a7aa398b084545a..9ee5d423130d639c6502e33ca71= 07f11bceb3d43 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -842,11 +842,11 @@ static void mtk_dsi_bridge_atomic_enable(struct drm_b= ridge *bridge, =20 mtk_output_dsi_enable(dsi); } =20 static void mtk_dsi_bridge_atomic_pre_enable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) + struct drm_atomic_state *state) { struct mtk_dsi *dsi =3D bridge_to_dsi(bridge); int ret; =20 ret =3D mtk_dsi_poweron(dsi); diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek= /mtk_hdmi.c index ca82bc829cb96446d4d34eeef45848df03bd716b..928909b4403a4c7ee6b919056f9= cfd0c01d13cbd 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -1360,11 +1360,11 @@ static void mtk_hdmi_bridge_mode_set(struct drm_bri= dge *bridge, =20 drm_mode_copy(&hdmi->mode, adjusted_mode); } =20 static void mtk_hdmi_bridge_atomic_pre_enable(struct drm_bridge *bridge, - struct drm_bridge_state *old_state) + struct drm_atomic_state *state) { struct mtk_hdmi *hdmi =3D hdmi_ctx_from_bridge(bridge); =20 mtk_hdmi_hw_make_reg_writable(hdmi, true); mtk_hdmi_hw_1p4_version_enable(hdmi, true); diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c index 5eb293bdb363d81341b20c11b8041bdb34663a1b..eb747ea3325c1d487ac879a91d2= b5436f5cd10c7 100644 --- a/drivers/gpu/drm/vc4/vc4_dsi.c +++ b/drivers/gpu/drm/vc4/vc4_dsi.c @@ -871,13 +871,12 @@ static bool vc4_dsi_bridge_mode_fixup(struct drm_brid= ge *bridge, =20 return true; } =20 static void vc4_dsi_bridge_pre_enable(struct drm_bridge *bridge, - struct drm_bridge_state *old_state) + struct drm_atomic_state *state) { - struct drm_atomic_state *state =3D old_state->base.state; struct vc4_dsi *dsi =3D bridge_to_vc4_dsi(bridge); const struct drm_crtc_state *crtc_state; struct device *dev =3D &dsi->pdev->dev; const struct drm_display_mode *mode; struct drm_connector *connector; diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 4b84faf14e368310dd20aa964e8178ec80aa6fa7..fe4f4807422425e0c3fa3e23825= 4c7ce39488ce1 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -303,11 +303,11 @@ struct drm_bridge_funcs { * there is one) when this callback is called. * * The @atomic_pre_enable callback is optional. */ void (*atomic_pre_enable)(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state); + struct drm_atomic_state *state); =20 /** * @atomic_enable: * * This callback should enable the bridge. It is called right after --=20 2.48.0