From nobody Fri Dec 19 04:49:42 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 88F242222C7 for ; Thu, 13 Feb 2025 14:44:09 +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=1739457849; cv=none; b=VVl3U7164eKPvrj3EMNeew7xzowgLZN+XXN/YvvdMInpvd6cmUl6kUELH3ZONFgIDP4N9CLdvbL444SSjp9g9FS3mKtuku8GlQGq4sorYxTAXxI28QIsxrtQgy+JDR1yOMkCtCoL7BeckNby/dHW/DXJFD84s6XdBCDLHeEKx9o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739457849; c=relaxed/simple; bh=2xfZrbgKwikKjZhrmr2KHwjOjjS2JcCwpBgKdzYX6EM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Jl+0brNrYUVbmldrjxJ6372qeAeJiK2tdDazN0ZWeckSWB/XlyiWasCdO0NBDD1hqGcByu1smV5JGonkXOkj14z8rRbO49WDm0CXNJKL/CvjbZr95q/Ue5R1cLK1RcIU0fenxLh8LOrQYNnNAH1VKeRpI/zbaHsNJBfeEfABNMY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=W9TXMung; 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="W9TXMung" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14B89C4CEE4; Thu, 13 Feb 2025 14:44:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739457849; bh=2xfZrbgKwikKjZhrmr2KHwjOjjS2JcCwpBgKdzYX6EM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=W9TXMung3NnULbNVGDLDBiKEuGCecOmzO6C7mY+0FIsBMJC2UFU7nV8VULXr1gBNH V8lJMpSkvd/wEt5/5EgkKNxJVtA5BrwDpRnOKxmOLXpvRpQnebp8l19yPcQ6E3LtdO NcWa9raddijsHYnMbko0S1ZSSPFAmY53WpDLtU3WW9FZ8bGFn6avbWTTW08heYvYm2 5arLYFu8xcskrvtVWTJ5vMNq+XA2ZIf1P+GSipap3UnevbBJujVIW6VD8/1/PQk1Es KmeokO6uox3gakILYDrOz1n5NEqwZ1JVE4CWOVdgvo1ZG7lJ3xFwHKJwgbLmOBRxpK awrfhYbn321qQ== From: Maxime Ripard Date: Thu, 13 Feb 2025 15:43:24 +0100 Subject: [PATCH v3 05/37] drm/bridge: Pass full state to atomic_post_disable 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: <20250213-bridge-connector-v3-5-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 , Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=18873; i=mripard@kernel.org; h=from:subject:message-id; bh=2xfZrbgKwikKjZhrmr2KHwjOjjS2JcCwpBgKdzYX6EM=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDOnrWCXa4i/vze1Y86SyU73D8c+1d4GBC478Trv8ZNLaM 8y29w0UO6ayMAhzMsiKKbI8kQk7vbx9cZWD/cofMHNYmUCGMHBxCsBERJwYa0X3P4vj/rxqab2t zZe29iV6VmUmb5dEz2rh05+78N+dT5UvlHO/RrP6lH85LyN6JWT+dcb6+k/G8T/uHNdMOirLHaB vElp181IU4yqL8q38LsLGO9drf9gUefSHudatlhDOM/XXK8sB 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_post_disable hook prototype to pass it directly. Reviewed-by: Dmitry Baryshkov Signed-off-by: Maxime Ripard Reviewed-by: Douglas Anderson Tested-by: Douglas Anderson --- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 6 ++---- drivers/gpu/drm/bridge/chipone-icn6211.c | 2 +- drivers/gpu/drm/bridge/ite-it6505.c | 2 +- drivers/gpu/drm/bridge/lontium-lt9611.c | 5 ++--- 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-sn65dsi86.c | 2 +- drivers/gpu/drm/drm_bridge.c | 16 +++------------- drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +- drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +- drivers/gpu/drm/msm/dp/dp_display.c | 14 +++++++------- drivers/gpu/drm/msm/dp/dp_drm.c | 5 ++--- drivers/gpu/drm/msm/dp/dp_drm.h | 2 +- drivers/gpu/drm/vc4/vc4_dsi.c | 2 +- include/drm/drm_bridge.h | 2 +- 20 files changed, 32 insertions(+), 46 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 5ebda1ca880439db8fbfa048be7274f763b82f51..60ce33eadd97548c39201332e26= b56e71245253a 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1359,15 +1359,13 @@ static void analogix_dp_bridge_atomic_disable(struc= t drm_bridge *bridge, } =20 analogix_dp_bridge_disable(bridge); } =20 -static void -analogix_dp_bridge_atomic_post_disable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) +static void analogix_dp_bridge_atomic_post_disable(struct drm_bridge *brid= ge, + 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 *new_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 2d9e3add135c45f63966ee9df8d4cbe3b215aa1f..81f7c701961fddadbced6e4ad1b= f9f12d3325fa7 100644 --- a/drivers/gpu/drm/bridge/chipone-icn6211.c +++ b/drivers/gpu/drm/bridge/chipone-icn6211.c @@ -479,11 +479,11 @@ static void chipone_atomic_pre_enable(struct drm_brid= ge *bridge, =20 usleep_range(10000, 11000); } =20 static void chipone_atomic_post_disable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) + struct drm_atomic_state *state) { struct chipone *icn =3D bridge_to_chipone(bridge); =20 clk_disable_unprepare(icn->refclk); =20 diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/i= te-it6505.c index d8265a205c0dc17e38c426e225e33c361a41a256..8a607558ac89ed2961d13515d98= 7c141f2b6e116 100644 --- a/drivers/gpu/drm/bridge/ite-it6505.c +++ b/drivers/gpu/drm/bridge/ite-it6505.c @@ -3262,11 +3262,11 @@ static void it6505_bridge_atomic_pre_enable(struct = drm_bridge *bridge, =20 pm_runtime_get_sync(dev); } =20 static void it6505_bridge_atomic_post_disable(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 bacc8d373fe7c8af1370afef2588d9c41fd7f5f3..026803034231f78c17f619dc041= 19bdd9b2b6679 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9611.c +++ b/drivers/gpu/drm/bridge/lontium-lt9611.c @@ -781,13 +781,12 @@ static void lt9611_bridge_atomic_pre_enable(struct dr= m_bridge *bridge, reg_cfg, ARRAY_SIZE(reg_cfg)); =20 lt9611->sleep =3D false; } =20 -static void -lt9611_bridge_atomic_post_disable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) +static void lt9611_bridge_atomic_post_disable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { struct lt9611 *lt9611 =3D bridge_to_lt9611(bridge); =20 lt9611_sleep_setup(lt9611); } diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c index 4ac9d32c701eb84df1fdff7d4ef06106bfd2e51d..890bd45c46eda8366e44974e3ec= 5891aa473fd00 100644 --- a/drivers/gpu/drm/bridge/panel.c +++ b/drivers/gpu/drm/bridge/panel.c @@ -164,14 +164,13 @@ static void panel_bridge_atomic_disable(struct drm_br= idge *bridge, =20 drm_panel_disable(panel_bridge->panel); } =20 static void panel_bridge_atomic_post_disable(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 *new_crtc_state; =20 crtc =3D drm_atomic_get_old_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 7ec674bffa81327ebeacecce091364e0f3e9a4f9..a42138b33258a48a303a97fbb07= 504893aeafaf7 100644 --- a/drivers/gpu/drm/bridge/parade-ps8640.c +++ b/drivers/gpu/drm/bridge/parade-ps8640.c @@ -470,11 +470,11 @@ static void ps8640_atomic_pre_enable(struct drm_bridg= e *bridge, =20 ps_bridge->pre_enabled =3D true; } =20 static void ps8640_atomic_post_disable(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); =20 ps_bridge->pre_enabled =3D false; =20 diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge= /samsung-dsim.c index 4a75a49110bca0e4ce71fbb81081fbffd7d72465..54de6ed2fae81bc13301a6b1ee8= f38183a3118b6 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1506,11 +1506,11 @@ static void samsung_dsim_atomic_disable(struct drm_= bridge *bridge, samsung_dsim_set_display_enable(dsi, false); dsi->state &=3D ~DSIM_STATE_VIDOUT_AVAILABLE; } =20 static void samsung_dsim_atomic_post_disable(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); =20 dsi->state &=3D ~DSIM_STATE_ENABLED; pm_runtime_put_sync(dsi->dev); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/dr= m/bridge/synopsys/dw-mipi-dsi.c index f9371b19a476bbba17165632e4f2230ac9d48e9d..2b6e70a49f438c475bc60d9595b= f246a9e54995b 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c @@ -932,11 +932,11 @@ static void dw_mipi_dsi_clear_err(struct dw_mipi_dsi = *dsi) dsi_write(dsi, DSI_INT_MSK0, 0); dsi_write(dsi, DSI_INT_MSK1, 0); } =20 static void dw_mipi_dsi_bridge_post_atomic_disable(struct drm_bridge *brid= ge, - struct drm_bridge_state *old_bridge_state) + struct drm_atomic_state *state) { struct dw_mipi_dsi *dsi =3D bridge_to_dsi(bridge); const struct dw_mipi_dsi_phy_ops *phy_ops =3D dsi->plat_data->phy_ops; =20 /* diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c b/drivers/gpu/d= rm/bridge/synopsys/dw-mipi-dsi2.c index 1d9d16fbcc7f2231fa71cc6a22a34be6f2ba46fd..5fd7a459efdd4fc4884cdf77ffe= dc19c36d1ca13 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c @@ -743,11 +743,11 @@ static int dw_mipi_dsi2_bridge_atomic_check(struct dr= m_bridge *bridge, =20 return 0; } =20 static void dw_mipi_dsi2_bridge_post_atomic_disable(struct drm_bridge *bri= dge, - struct drm_bridge_state *old_bridge_state) + struct drm_atomic_state *state) { struct dw_mipi_dsi2 *dsi2 =3D bridge_to_dsi2(bridge); const struct dw_mipi_dsi2_phy_ops *phy_ops =3D dsi2->plat_data->phy_ops; =20 regmap_write(dsi2->regmap, DSI2_IPI_PIX_PKT_CFG, 0); diff --git a/drivers/gpu/drm/bridge/tc358762.c b/drivers/gpu/drm/bridge/tc3= 58762.c index 6ed8ae6ffc3defa9857397a7f47d44195ac0f774..49c76027f8316967ea4f7d7dfb8= 5920a025b6df9 100644 --- a/drivers/gpu/drm/bridge/tc358762.c +++ b/drivers/gpu/drm/bridge/tc358762.c @@ -147,11 +147,12 @@ static int tc358762_init(struct tc358762 *ctx) msleep(100); =20 return tc358762_clear_error(ctx); } =20 -static void tc358762_post_disable(struct drm_bridge *bridge, struct drm_br= idge_state *state) +static void tc358762_post_disable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { struct tc358762 *ctx =3D bridge_to_tc358762(bridge); int ret; =20 /* diff --git a/drivers/gpu/drm/bridge/ti-dlpc3433.c b/drivers/gpu/drm/bridge/= ti-dlpc3433.c index 963af4fc28a88f7ed0b0f01933d96dd8077c6602..85f2a0e74a1c8aaa272ce828ad1= c82660503b7a8 100644 --- a/drivers/gpu/drm/bridge/ti-dlpc3433.c +++ b/drivers/gpu/drm/bridge/ti-dlpc3433.c @@ -191,11 +191,11 @@ static void dlpc_atomic_pre_enable(struct drm_bridge = *bridge, =20 msleep(10); } =20 static void dlpc_atomic_post_disable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) + struct drm_atomic_state *state) { struct dlpc *dlpc =3D bridge_to_dlpc(bridge); =20 regulator_disable(dlpc->vcc_flsh); regulator_disable(dlpc->vcc_intf); diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge= /ti-sn65dsi86.c index 38f30aad7d9b72083272702c8bda73e61dbe0267..ae34585e05b307934d9fbf0dfd7= ad159a99d4c17 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c @@ -1176,11 +1176,11 @@ static void ti_sn_bridge_atomic_pre_enable(struct d= rm_bridge *bridge, /* td7: min 100 us after enable before DSI data */ usleep_range(100, 110); } =20 static void ti_sn_bridge_atomic_post_disable(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 /* semi auto link training mode OFF */ regmap_write(pdata->regmap, SN_ML_TX_MODE_REG, 0); diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index 198083cacfc0924f1fd3bcf7a6a690f4e5779de0..cb71ec57c47af889c2028c74d0b= bcfa2fed1f88b 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -583,24 +583,14 @@ void drm_atomic_bridge_chain_disable(struct drm_bridg= e *bridge, EXPORT_SYMBOL(drm_atomic_bridge_chain_disable); =20 static void drm_atomic_bridge_call_post_disable(struct drm_bridge *bridge, struct drm_atomic_state *old_state) { - if (old_state && bridge->funcs->atomic_post_disable) { - 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_post_disable(bridge, - old_bridge_state); - } else if (bridge->funcs->post_disable) { + if (old_state && bridge->funcs->atomic_post_disable) + bridge->funcs->atomic_post_disable(bridge, old_state); + else if (bridge->funcs->post_disable) bridge->funcs->post_disable(bridge); - } } =20 /** * drm_atomic_bridge_chain_post_disable - cleans up after disabling all br= idges * in the encoder chain diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/= mtk_dsi.c index 661db80b2377fce4ea09a46c4ad19a58fab3fe7d..b50dc9a013ac5a50e464134f548= fa773a5662138 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -854,11 +854,11 @@ static void mtk_dsi_bridge_atomic_pre_enable(struct d= rm_bridge *bridge, if (ret < 0) DRM_ERROR("failed to power on dsi\n"); } =20 static void mtk_dsi_bridge_atomic_post_disable(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); =20 mtk_dsi_poweroff(dsi); } diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek= /mtk_hdmi.c index 602c9d348a7d3ec4f0ba13386508c531772b6e14..ac5e40c2761710dfbe722e1ba56= 9d76e4cd5b8fb 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -1324,11 +1324,11 @@ static void mtk_hdmi_bridge_atomic_disable(struct d= rm_bridge *bridge, =20 hdmi->enabled =3D false; } =20 static void mtk_hdmi_bridge_atomic_post_disable(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 if (!hdmi->powered) return; diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/d= p_display.c index 77948f0514de572caa9bc776a3d0fc178bf3bd51..8b1cc8f166b86678ac348eea987= 54e9b75fc7436 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -1562,33 +1562,33 @@ void msm_dp_bridge_atomic_disable(struct drm_bridge= *drm_bridge, =20 msm_dp_ctrl_push_idle(msm_dp_display->ctrl); } =20 void msm_dp_bridge_atomic_post_disable(struct drm_bridge *drm_bridge, - struct drm_bridge_state *old_bridge_state) + struct drm_atomic_state *state) { struct msm_dp_bridge *msm_dp_bridge =3D to_dp_bridge(drm_bridge); struct msm_dp *dp =3D msm_dp_bridge->msm_dp_display; - u32 state; + u32 hpd_state; struct msm_dp_display_private *msm_dp_display; =20 msm_dp_display =3D container_of(dp, struct msm_dp_display_private, msm_dp= _display); =20 if (dp->is_edp) msm_dp_hpd_unplug_handle(msm_dp_display, 0); =20 mutex_lock(&msm_dp_display->event_mutex); =20 - state =3D msm_dp_display->hpd_state; - if (state !=3D ST_DISCONNECT_PENDING && state !=3D ST_CONNECTED) + hpd_state =3D msm_dp_display->hpd_state; + if (hpd_state !=3D ST_DISCONNECT_PENDING && hpd_state !=3D ST_CONNECTED) drm_dbg_dp(dp->drm_dev, "type=3D%d wrong hpd_state=3D%d\n", - dp->connector_type, state); + dp->connector_type, hpd_state); =20 msm_dp_display_disable(msm_dp_display); =20 - state =3D msm_dp_display->hpd_state; - if (state =3D=3D ST_DISCONNECT_PENDING) { + hpd_state =3D msm_dp_display->hpd_state; + if (hpd_state =3D=3D ST_DISCONNECT_PENDING) { /* completed disconnection */ msm_dp_display->hpd_state =3D ST_DISCONNECTED; } else { msm_dp_display->hpd_state =3D ST_DISPLAY_OFF; } diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_dr= m.c index 84ecec79467dcb1d3c35abf422b1d6b7caf8d0ee..dc888f8269d698daa046d5a861a= 2a8bd80aa76d3 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_drm.c @@ -208,13 +208,12 @@ static void msm_edp_bridge_atomic_disable(struct drm_= bridge *drm_bridge, out: msm_dp_bridge_atomic_disable(drm_bridge, atomic_state); } =20 static void msm_edp_bridge_atomic_post_disable(struct drm_bridge *drm_brid= ge, - struct drm_bridge_state *old_bridge_state) + struct drm_atomic_state *atomic_state) { - struct drm_atomic_state *atomic_state =3D old_bridge_state->base.state; struct drm_crtc *crtc; struct drm_crtc_state *new_crtc_state =3D NULL; =20 crtc =3D drm_atomic_get_old_crtc_for_encoder(atomic_state, drm_bridge->encoder); @@ -229,11 +228,11 @@ static void msm_edp_bridge_atomic_post_disable(struct= drm_bridge *drm_bridge, * Self refresh mode is already set in msm_edp_bridge_atomic_disable. */ if (new_crtc_state->self_refresh_active) return; =20 - msm_dp_bridge_atomic_post_disable(drm_bridge, old_bridge_state); + msm_dp_bridge_atomic_post_disable(drm_bridge, atomic_state); } =20 /** * msm_edp_bridge_mode_valid - callback to determine if specified mode is = valid * @bridge: Pointer to drm bridge structure diff --git a/drivers/gpu/drm/msm/dp/dp_drm.h b/drivers/gpu/drm/msm/dp/dp_dr= m.h index faf31a9da752c9ea65e80c8c95896fef39ffa8a8..d8c9b905f8bfb5abe47c1cb26d1= 7bc605e3e1ba6 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.h +++ b/drivers/gpu/drm/msm/dp/dp_drm.h @@ -28,11 +28,11 @@ int msm_dp_bridge_init(struct msm_dp *msm_dp_display, s= truct drm_device *dev, void msm_dp_bridge_atomic_enable(struct drm_bridge *drm_bridge, struct drm_atomic_state *state); void msm_dp_bridge_atomic_disable(struct drm_bridge *drm_bridge, struct drm_atomic_state *state); void msm_dp_bridge_atomic_post_disable(struct drm_bridge *drm_bridge, - struct drm_bridge_state *old_bridge_state); + struct drm_atomic_state *state); enum drm_mode_status msm_dp_bridge_mode_valid(struct drm_bridge *bridge, const struct drm_display_info *info, const struct drm_display_mode *mode); void msm_dp_bridge_mode_set(struct drm_bridge *drm_bridge, const struct drm_display_mode *mode, diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c index 60b300db52d24af6a04131c99cfdc05b6e9509aa..779b22efe27bffc586a760fdc49= 012e02ac23d0d 100644 --- a/drivers/gpu/drm/vc4/vc4_dsi.c +++ b/drivers/gpu/drm/vc4/vc4_dsi.c @@ -809,11 +809,11 @@ static void vc4_dsi_bridge_disable(struct drm_bridge = *bridge, disp0_ctrl &=3D ~DSI_DISP0_ENABLE; DSI_PORT_WRITE(DISP0_CTRL, disp0_ctrl); } =20 static void vc4_dsi_bridge_post_disable(struct drm_bridge *bridge, - struct drm_bridge_state *state) + struct drm_atomic_state *state) { struct vc4_dsi *dsi =3D bridge_to_vc4_dsi(bridge); struct device *dev =3D &dsi->pdev->dev; =20 clk_disable_unprepare(dsi->pll_phy_clock); diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 087752226bf9c25b47838be265ad2e4c3070bc7e..d4c75d59fa12be1bd7375ce3ea5= 6415235781b28 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -359,11 +359,11 @@ struct drm_bridge_funcs { * called. * * The @atomic_post_disable callback is optional. */ void (*atomic_post_disable)(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state); + struct drm_atomic_state *state); =20 /** * @atomic_duplicate_state: * * Duplicate the current bridge state object (which is guaranteed to be --=20 2.48.0