From nobody Sun Dec 14 13:53:06 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 8AC31266EEB for ; Thu, 13 Mar 2025 12:00:15 +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=1741867215; cv=none; b=ZeytPvUlL+huJmc98cDoQG1cpweNiXs1lwrDJRtPWbki8BW/KrRY1nDWYD0TW4ivdMSO2mhdWJp0bbDf7+ha20iUHPjiwOHudUz9i7kSyvwmEE6HXFEUwTn6wu2HJKaDeGIPPv8h2D0nShELh4MWAOZ6oY7tgg6HUxpPcDN3e7Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867215; c=relaxed/simple; bh=v6a7Dpo2bRZPi4YzGT4WiIl08+PAXB9kqZB7kgV00QU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=K+mtBdzuEl4qaiJDAUurZokERtZklU66+F7QleYVzj325owS4g+0yPNpCSbFbAQkN/KU9vsZcUVCEzk1BNldzeGXVevCUE2MWV7+FbhzH05CFUgTsmfBuWFpYAnWDaOWg/VB6BET00yft8kj/8vU3t2NdoU4du55W3uqOqOmu5w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=F6n0qstP; 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="F6n0qstP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91E28C4AF09; Thu, 13 Mar 2025 12:00:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741867215; bh=v6a7Dpo2bRZPi4YzGT4WiIl08+PAXB9kqZB7kgV00QU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=F6n0qstPSahWSe9BIgy+hZtFPFp5NW9sPVdvVyeXT1GnIAQIfikyuvByfPGwvpPzx DavuVnY7YK1NnlD2/04yFjpuhjH6D9Ktmewe47BEt8rFPc40o0krQz6rkZbbgWEsTu k4Wfto6vV602WkccYzTACGBiC0tuak9VRmZq9D8YtVFIQv81B7h2QOskzzsjLn0ziW uNBnTRta1kDXDgMUnfJ/w9YjgrtJo1rKs81f2EqPzVXe0L520zf8wbxH1YwCWU0jkE okc3oz4YkzI/n118mcU54T3/1xKSBRi/FYFBAw4/i4c8grUZmu3U8dgk/drhfjUeB4 tPyAvyeZE0zug== From: Maxime Ripard Date: Thu, 13 Mar 2025 12:59:55 +0100 Subject: [PATCH v6 01/16] drm/bridge: Add encoder parameter to drm_bridge_funcs.attach 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: <20250313-bridge-connector-v6-1-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 , Luca Ceresoli X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=89201; i=mripard@kernel.org; h=from:subject:message-id; bh=v6a7Dpo2bRZPi4YzGT4WiIl08+PAXB9kqZB7kgV00QU=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOmXTuxT8XA7W300QSdghox0x44fiwNevVmy/Z0N07Vnh 07n1Qpxd5SyMIhxMciKKbLECJsviTs163UnG988mDmsTCBDGLg4BWAiPAEM/zMP7GtR2nzfn8v8 7lW1vPkMvoZ7v9Tl3qjcuzYhqmxlxROG/04Vu5x7zSMmWsVtYX94dNmMk9Kbq77IvZnaJK7klZ3 jww0A X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D The drm_bridge structure contains an encoder pointer that is widely used by bridge drivers. This pattern is largely documented as deprecated in other KMS entities for atomic drivers. However, one of the main use of that pointer is done in attach to just call drm_bridge_attach on the next bridge to add it to the bridge list. While this dereferences the bridge->encoder pointer, it's effectively the same encoder the bridge was being attached to. We can make it more explicit by adding the encoder the bridge is attached to to the list of attach parameters. This also removes the need to dereference bridge->encoder in most drivers. Reviewed-by: Dmitry Baryshkov Reviewed-by: Douglas Anderson Tested-by: Douglas Anderson Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli Signed-off-by: Maxime Ripard --- drivers/gpu/drm/adp/adp-mipi.c | 3 ++- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 3 ++- drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 3 ++- drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 3 ++- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 +- drivers/gpu/drm/bridge/analogix/anx7625.c | 3 ++- drivers/gpu/drm/bridge/aux-bridge.c | 3 ++- drivers/gpu/drm/bridge/aux-hpd-bridge.c | 1 + drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c | 3 ++- drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 1 + drivers/gpu/drm/bridge/chipone-icn6211.c | 6 ++++-- drivers/gpu/drm/bridge/chrontel-ch7033.c | 5 +++-- drivers/gpu/drm/bridge/display-connector.c | 1 + drivers/gpu/drm/bridge/fsl-ldb.c | 3 ++- drivers/gpu/drm/bridge/imx/imx-ldb-helper.c | 7 +++---- drivers/gpu/drm/bridge/imx/imx-ldb-helper.h | 2 +- drivers/gpu/drm/bridge/imx/imx-legacy-bridge.c | 3 ++- drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c | 3 ++- drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 3 ++- drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c | 3 ++- drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 3 ++- drivers/gpu/drm/bridge/ite-it6263.c | 7 ++++--- drivers/gpu/drm/bridge/ite-it6505.c | 1 + drivers/gpu/drm/bridge/ite-it66121.c | 3 ++- drivers/gpu/drm/bridge/lontium-lt8912b.c | 3 ++- drivers/gpu/drm/bridge/lontium-lt9211.c | 3 ++- drivers/gpu/drm/bridge/lontium-lt9611.c | 3 ++- drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 3 ++- drivers/gpu/drm/bridge/lvds-codec.c | 3 ++- drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 1 + drivers/gpu/drm/bridge/microchip-lvds.c | 3 ++- drivers/gpu/drm/bridge/nwl-dsi.c | 3 ++- drivers/gpu/drm/bridge/nxp-ptn3460.c | 5 +++-- drivers/gpu/drm/bridge/panel.c | 3 ++- drivers/gpu/drm/bridge/parade-ps8622.c | 1 + drivers/gpu/drm/bridge/parade-ps8640.c | 3 ++- drivers/gpu/drm/bridge/samsung-dsim.c | 3 ++- drivers/gpu/drm/bridge/sii902x.c | 5 +++-- drivers/gpu/drm/bridge/sil-sii8620.c | 1 + drivers/gpu/drm/bridge/simple-bridge.c | 5 +++-- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 3 ++- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 5 +++-- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c | 5 +++-- drivers/gpu/drm/bridge/tc358762.c | 3 ++- drivers/gpu/drm/bridge/tc358764.c | 3 ++- drivers/gpu/drm/bridge/tc358767.c | 2 ++ drivers/gpu/drm/bridge/tc358768.c | 3 ++- drivers/gpu/drm/bridge/tc358775.c | 3 ++- drivers/gpu/drm/bridge/tda998x_drv.c | 1 + drivers/gpu/drm/bridge/thc63lvd1024.c | 3 ++- drivers/gpu/drm/bridge/ti-dlpc3433.c | 4 ++-- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 3 ++- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 3 ++- drivers/gpu/drm/bridge/ti-tdp158.c | 6 ++++-- drivers/gpu/drm/bridge/ti-tfp410.c | 5 +++-- drivers/gpu/drm/bridge/ti-tpd12s015.c | 3 ++- drivers/gpu/drm/drm_bridge.c | 2 +- drivers/gpu/drm/imx/ipuv3/parallel-display.c | 3 ++- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 5 +++-- drivers/gpu/drm/mcde/mcde_dsi.c | 3 ++- drivers/gpu/drm/mediatek/mtk_dp.c | 3 ++- drivers/gpu/drm/mediatek/mtk_dpi.c | 3 ++- drivers/gpu/drm/mediatek/mtk_dsi.c | 3 ++- drivers/gpu/drm/mediatek/mtk_hdmi.c | 3 ++- drivers/gpu/drm/meson/meson_encoder_cvbs.c | 3 ++- drivers/gpu/drm/meson/meson_encoder_dsi.c | 3 ++- drivers/gpu/drm/meson/meson_encoder_hdmi.c | 3 ++- drivers/gpu/drm/msm/dsi/dsi_manager.c | 3 ++- drivers/gpu/drm/omapdrm/dss/dpi.c | 3 ++- drivers/gpu/drm/omapdrm/dss/dsi.c | 3 ++- drivers/gpu/drm/omapdrm/dss/hdmi4.c | 3 ++- drivers/gpu/drm/omapdrm/dss/hdmi5.c | 3 ++- drivers/gpu/drm/omapdrm/dss/sdi.c | 3 ++- drivers/gpu/drm/omapdrm/dss/venc.c | 3 ++- drivers/gpu/drm/renesas/rcar-du/rcar_lvds.c | 3 ++- drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 3 ++- drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c | 3 ++- drivers/gpu/drm/stm/lvds.c | 11 +++++------ drivers/gpu/drm/tidss/tidss_encoder.c | 3 ++- drivers/gpu/drm/vc4/vc4_dsi.c | 3 ++- drivers/gpu/drm/xlnx/zynqmp_dp.c | 3 ++- drivers/platform/arm64/acer-aspire1-ec.c | 3 ++- include/drm/drm_bridge.h | 2 +- 83 files changed, 172 insertions(+), 95 deletions(-) diff --git a/drivers/gpu/drm/adp/adp-mipi.c b/drivers/gpu/drm/adp/adp-mipi.c index ad80542b60ed6de3fe76a4d134b87d20df98ee33..2b60128e2c693e9f85affff569c= c57cdb6f47909 100644 --- a/drivers/gpu/drm/adp/adp-mipi.c +++ b/drivers/gpu/drm/adp/adp-mipi.c @@ -210,16 +210,17 @@ static const struct mipi_dsi_host_ops adp_dsi_host_op= s =3D { .attach =3D adp_dsi_host_attach, .detach =3D adp_dsi_host_detach, }; =20 static int adp_dsi_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct adp_mipi_drv_private *adp =3D container_of(bridge, struct adp_mipi_drv_private, bridge); =20 - return drm_bridge_attach(bridge->encoder, adp->next_bridge, bridge, flags= ); + return drm_bridge_attach(encoder, adp->next_bridge, bridge, flags); } =20 static const struct drm_bridge_funcs adp_dsi_bridge_funcs =3D { .attach =3D adp_dsi_bridge_attach, }; diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm= /bridge/adv7511/adv7511_drv.c index 050dae338ffee36a8d6ee6fcce69f51486a957fe..1257009e850c1b20184cfaea5b6= a4440e75e10d7 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -946,17 +946,18 @@ static enum drm_mode_status adv7511_bridge_mode_valid= (struct drm_bridge *bridge, else return adv7511_mode_valid(adv, mode); } =20 static int adv7511_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct adv7511 *adv =3D bridge_to_adv7511(bridge); int ret =3D 0; =20 if (adv->next_bridge) { - ret =3D drm_bridge_attach(bridge->encoder, adv->next_bridge, bridge, + ret =3D drm_bridge_attach(encoder, adv->next_bridge, bridge, flags | DRM_BRIDGE_ATTACH_NO_CONNECTOR); if (ret) return ret; } =20 diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c b/drivers/g= pu/drm/bridge/analogix/analogix-anx6345.c index 83d711ee3a2eb8b7a491c115171b5cc12a9df066..a88a33eb5d972cb47e82cfccde8= 7ecf43d051637 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c @@ -515,10 +515,11 @@ static const struct drm_connector_funcs anx6345_conne= ctor_funcs =3D { .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, }; =20 static int anx6345_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct anx6345 *anx6345 =3D bridge_to_anx6345(bridge); int err; =20 @@ -551,11 +552,11 @@ static int anx6345_bridge_attach(struct drm_bridge *b= ridge, &anx6345_connector_helper_funcs); =20 anx6345->connector.polled =3D DRM_CONNECTOR_POLL_HPD; =20 err =3D drm_connector_attach_encoder(&anx6345->connector, - bridge->encoder); + encoder); if (err) { DRM_ERROR("Failed to link up connector to encoder: %d\n", err); goto connector_cleanup; } =20 diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c b/drivers/g= pu/drm/bridge/analogix/analogix-anx78xx.c index f74694bb9c50a2f71d51d27e08c08bb854cf29ea..8b4597885614d6278f5782fdce5= 065044d5c2966 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c @@ -886,10 +886,11 @@ static const struct drm_connector_funcs anx78xx_conne= ctor_funcs =3D { .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, }; =20 static int anx78xx_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct anx78xx *anx78xx =3D bridge_to_anx78xx(bridge); int err; =20 @@ -922,11 +923,11 @@ static int anx78xx_bridge_attach(struct drm_bridge *b= ridge, &anx78xx_connector_helper_funcs); =20 anx78xx->connector.polled =3D DRM_CONNECTOR_POLL_HPD; =20 err =3D drm_connector_attach_encoder(&anx78xx->connector, - bridge->encoder); + encoder); if (err) { DRM_ERROR("Failed to link up connector to encoder: %d\n", err); goto connector_cleanup; } =20 diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/g= pu/drm/bridge/analogix/analogix_dp_core.c index 071168aa0c3bda880d3a53093159fb7b9681931c..042154e2d8ccd74ac2dc27fe527= e810a50e08a09 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1111,14 +1111,14 @@ static const struct drm_connector_funcs analogix_dp= _connector_funcs =3D { .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, }; =20 static int analogix_dp_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct analogix_dp_device *dp =3D bridge->driver_private; - struct drm_encoder *encoder =3D dp->encoder; struct drm_connector *connector =3D NULL; int ret =3D 0; =20 if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { DRM_ERROR("Fix bridge driver to make connector optional!"); diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/br= idge/analogix/anx7625.c index 0b97b66de577421b0e68e748d0075f674c71fbf1..0b61e77c0398bbce3ecf55753dd= e71a27eda8fe5 100644 --- a/drivers/gpu/drm/bridge/analogix/anx7625.c +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c @@ -2139,10 +2139,11 @@ static void hdcp_check_work_func(struct work_struct= *work) mutex_unlock(&ctx->hdcp_wq_lock); drm_modeset_unlock(&drm_dev->mode_config.connection_mutex); } =20 static int anx7625_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct anx7625_data *ctx =3D bridge_to_anx7625(bridge); int err; struct device *dev =3D ctx->dev; @@ -2157,11 +2158,11 @@ static int anx7625_bridge_attach(struct drm_bridge = *bridge, dev_err(dev, "failed to register aux channel: %d\n", err); return err; } =20 if (ctx->pdata.panel_bridge) { - err =3D drm_bridge_attach(bridge->encoder, + err =3D drm_bridge_attach(encoder, ctx->pdata.panel_bridge, &ctx->bridge, flags); if (err) return err; } diff --git a/drivers/gpu/drm/bridge/aux-bridge.c b/drivers/gpu/drm/bridge/a= ux-bridge.c index 015983c015e508f75435bf97ee1dba785edcd23e..c179b86d208f70d95b41e6f2157= b78f97bac4d8d 100644 --- a/drivers/gpu/drm/bridge/aux-bridge.c +++ b/drivers/gpu/drm/bridge/aux-bridge.c @@ -84,20 +84,21 @@ struct drm_aux_bridge_data { struct drm_bridge *next_bridge; struct device *dev; }; =20 static int drm_aux_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct drm_aux_bridge_data *data; =20 if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) return -EINVAL; =20 data =3D container_of(bridge, struct drm_aux_bridge_data, bridge); =20 - return drm_bridge_attach(bridge->encoder, data->next_bridge, bridge, + return drm_bridge_attach(encoder, data->next_bridge, bridge, DRM_BRIDGE_ATTACH_NO_CONNECTOR); } =20 static const struct drm_bridge_funcs drm_aux_bridge_funcs =3D { .attach =3D drm_aux_bridge_attach, diff --git a/drivers/gpu/drm/bridge/aux-hpd-bridge.c b/drivers/gpu/drm/brid= ge/aux-hpd-bridge.c index 48f297c78ee67c8f9034869f6824a6dc7f88bdd7..b3f588b71a7d7ad5c2ee7b07c39= 079bc5ba34cee 100644 --- a/drivers/gpu/drm/bridge/aux-hpd-bridge.c +++ b/drivers/gpu/drm/bridge/aux-hpd-bridge.c @@ -154,10 +154,11 @@ void drm_aux_hpd_bridge_notify(struct device *dev, en= um drm_connector_status sta drm_bridge_hpd_notify(&data->bridge, status); } EXPORT_SYMBOL_GPL(drm_aux_hpd_bridge_notify); =20 static int drm_aux_hpd_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { return flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR ? 0 : -EINVAL; } =20 diff --git a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c b/drivers/gpu/d= rm/bridge/cadence/cdns-dsi-core.c index c7a0247e06adf3e532f830363b3422a8058513ef..8f54c034ac4f3e82c38607a0e52= d4745654b571f 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c +++ b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c @@ -603,10 +603,11 @@ static int cdns_dsi_check_conf(struct cdns_dsi *dsi, =20 return 0; } =20 static int cdns_dsi_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct cdns_dsi_input *input =3D bridge_to_cdns_dsi_input(bridge); struct cdns_dsi *dsi =3D input_to_dsi(input); struct cdns_dsi_output *output =3D &dsi->output; @@ -615,11 +616,11 @@ static int cdns_dsi_bridge_attach(struct drm_bridge *= bridge, dev_err(dsi->base.dev, "cdns-dsi driver is only compatible with DRM devices supporting atomic = updates"); return -ENOTSUPP; } =20 - return drm_bridge_attach(bridge->encoder, output->bridge, bridge, + return drm_bridge_attach(encoder, output->bridge, bridge, flags); } =20 static enum drm_mode_status cdns_dsi_bridge_mode_valid(struct drm_bridge *bridge, diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c b/drivers/= gpu/drm/bridge/cadence/cdns-mhdp8546-core.c index 81fad14c2cd598045d989c7d51f292bafb92c144..ae1bd58975ce3ab42b6633d537e= 5280d14d2614b 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c @@ -1724,10 +1724,11 @@ static int cdns_mhdp_connector_init(struct cdns_mhd= p_device *mhdp) =20 return ret; } =20 static int cdns_mhdp_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct cdns_mhdp_device *mhdp =3D bridge_to_mhdp(bridge); bool hw_ready; int ret; diff --git a/drivers/gpu/drm/bridge/chipone-icn6211.c b/drivers/gpu/drm/bri= dge/chipone-icn6211.c index 81f7c701961fddadbced6e4ad1bf9f12d3325fa7..634c5b0306679d2e68798c2b901= 3aae4491dd44c 100644 --- a/drivers/gpu/drm/bridge/chipone-icn6211.c +++ b/drivers/gpu/drm/bridge/chipone-icn6211.c @@ -578,15 +578,17 @@ static int chipone_dsi_host_attach(struct chipone *ic= n) mipi_dsi_device_unregister(dsi); =20 return ret; } =20 -static int chipone_attach(struct drm_bridge *bridge, enum drm_bridge_attac= h_flags flags) +static int chipone_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, + enum drm_bridge_attach_flags flags) { struct chipone *icn =3D bridge_to_chipone(bridge); =20 - return drm_bridge_attach(bridge->encoder, icn->panel_bridge, bridge, flag= s); + return drm_bridge_attach(encoder, icn->panel_bridge, bridge, flags); } =20 #define MAX_INPUT_SEL_FORMATS 1 =20 static u32 * diff --git a/drivers/gpu/drm/bridge/chrontel-ch7033.c b/drivers/gpu/drm/bri= dge/chrontel-ch7033.c index da17f0978a791fe9bffab3fa0527e3a355d65c6b..210c45c1efd48f5b541bf73da66= a169c27e110b2 100644 --- a/drivers/gpu/drm/bridge/chrontel-ch7033.c +++ b/drivers/gpu/drm/bridge/chrontel-ch7033.c @@ -266,17 +266,18 @@ static void ch7033_hpd_event(void *arg, enum drm_conn= ector_status status) if (priv->bridge.dev) drm_helper_hpd_irq_event(priv->connector.dev); } =20 static int ch7033_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct ch7033_priv *priv =3D bridge_to_ch7033_priv(bridge); struct drm_connector *connector =3D &priv->connector; int ret; =20 - ret =3D drm_bridge_attach(bridge->encoder, priv->next_bridge, bridge, + ret =3D drm_bridge_attach(encoder, priv->next_bridge, bridge, DRM_BRIDGE_ATTACH_NO_CONNECTOR); if (ret) return ret; =20 if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) @@ -303,11 +304,11 @@ static int ch7033_bridge_attach(struct drm_bridge *br= idge, if (ret) { DRM_ERROR("Failed to initialize connector\n"); return ret; } =20 - return drm_connector_attach_encoder(&priv->connector, bridge->encoder); + return drm_connector_attach_encoder(&priv->connector, encoder); } =20 static void ch7033_bridge_detach(struct drm_bridge *bridge) { struct ch7033_priv *priv =3D bridge_to_ch7033_priv(bridge); diff --git a/drivers/gpu/drm/bridge/display-connector.c b/drivers/gpu/drm/b= ridge/display-connector.c index 72bc508d4e6e2bf5be535c8856b46465d1ff835e..09c08a53d5bdc5c48f5d520472f= 5a311289d4862 100644 --- a/drivers/gpu/drm/bridge/display-connector.c +++ b/drivers/gpu/drm/bridge/display-connector.c @@ -32,10 +32,11 @@ to_display_connector(struct drm_bridge *bridge) { return container_of(bridge, struct display_connector, bridge); } =20 static int display_connector_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { return flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR ? 0 : -EINVAL; } =20 diff --git a/drivers/gpu/drm/bridge/fsl-ldb.c b/drivers/gpu/drm/bridge/fsl-= ldb.c index 26ae1ab5237f81ebd6c56075a18136f4a5b56ec9..72d8f32d48faf6726ea67d8770e= d83f77f3a0862 100644 --- a/drivers/gpu/drm/bridge/fsl-ldb.c +++ b/drivers/gpu/drm/bridge/fsl-ldb.c @@ -111,15 +111,16 @@ static unsigned long fsl_ldb_link_frequency(struct fs= l_ldb *fsl_ldb, int clock) else return clock * 7000; } =20 static int fsl_ldb_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct fsl_ldb *fsl_ldb =3D to_fsl_ldb(bridge); =20 - return drm_bridge_attach(bridge->encoder, fsl_ldb->panel_bridge, + return drm_bridge_attach(encoder, fsl_ldb->panel_bridge, bridge, flags); } =20 static void fsl_ldb_atomic_enable(struct drm_bridge *bridge, struct drm_atomic_state *state) diff --git a/drivers/gpu/drm/bridge/imx/imx-ldb-helper.c b/drivers/gpu/drm/= bridge/imx/imx-ldb-helper.c index 9b5bebbe357dd4905a792abc5cecdbb9ce10ffb8..61347f6ec33d906264f7e06902b= 0d915d263f3f8 100644 --- a/drivers/gpu/drm/bridge/imx/imx-ldb-helper.c +++ b/drivers/gpu/drm/bridge/imx/imx-ldb-helper.c @@ -102,11 +102,11 @@ void ldb_bridge_disable_helper(struct drm_bridge *bri= dge) =20 regmap_write(ldb->regmap, ldb->ctrl_reg, ldb->ldb_ctrl); } EXPORT_SYMBOL_GPL(ldb_bridge_disable_helper); =20 -int ldb_bridge_attach_helper(struct drm_bridge *bridge, +int ldb_bridge_attach_helper(struct drm_bridge *bridge, struct drm_encoder= *encoder, enum drm_bridge_attach_flags flags) { struct ldb_channel *ldb_ch =3D bridge->driver_private; struct ldb *ldb =3D ldb_ch->ldb; =20 @@ -114,13 +114,12 @@ int ldb_bridge_attach_helper(struct drm_bridge *bridg= e, DRM_DEV_ERROR(ldb->dev, "do not support creating a drm_connector\n"); return -EINVAL; } =20 - return drm_bridge_attach(bridge->encoder, - ldb_ch->next_bridge, bridge, - DRM_BRIDGE_ATTACH_NO_CONNECTOR); + return drm_bridge_attach(encoder, ldb_ch->next_bridge, bridge, + DRM_BRIDGE_ATTACH_NO_CONNECTOR); } EXPORT_SYMBOL_GPL(ldb_bridge_attach_helper); =20 int ldb_init_helper(struct ldb *ldb) { diff --git a/drivers/gpu/drm/bridge/imx/imx-ldb-helper.h b/drivers/gpu/drm/= bridge/imx/imx-ldb-helper.h index a0a5cde27fbc6eb0d3932381f78d6803542b9bac..38a8a54b37a60e1be942aaa60b1= d1bc375a7a131 100644 --- a/drivers/gpu/drm/bridge/imx/imx-ldb-helper.h +++ b/drivers/gpu/drm/bridge/imx/imx-ldb-helper.h @@ -79,11 +79,11 @@ void ldb_bridge_mode_set_helper(struct drm_bridge *brid= ge, =20 void ldb_bridge_enable_helper(struct drm_bridge *bridge); =20 void ldb_bridge_disable_helper(struct drm_bridge *bridge); =20 -int ldb_bridge_attach_helper(struct drm_bridge *bridge, +int ldb_bridge_attach_helper(struct drm_bridge *bridge, struct drm_encoder= *encoder, enum drm_bridge_attach_flags flags); =20 int ldb_init_helper(struct ldb *ldb); =20 int ldb_find_next_bridge_helper(struct ldb *ldb); diff --git a/drivers/gpu/drm/bridge/imx/imx-legacy-bridge.c b/drivers/gpu/d= rm/bridge/imx/imx-legacy-bridge.c index 55a763045812ac465771646b3438e0057500342e..f072c6ed39ef183b10518b43bd6= d979bc89e36f9 100644 --- a/drivers/gpu/drm/bridge/imx/imx-legacy-bridge.c +++ b/drivers/gpu/drm/bridge/imx/imx-legacy-bridge.c @@ -21,11 +21,12 @@ struct imx_legacy_bridge { }; =20 #define to_imx_legacy_bridge(bridge) container_of(bridge, struct imx_legac= y_bridge, base) =20 static int imx_legacy_bridge_attach(struct drm_bridge *bridge, - enum drm_bridge_attach_flags flags) + struct drm_encoder *encoder, + enum drm_bridge_attach_flags flags) { if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) return -EINVAL; =20 return 0; diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c b/drivers/gpu/drm= /bridge/imx/imx8mp-hdmi-pvi.c index a17433a7c75530668662ed8dd1526b44f9a32f32..8a4fd7d77a8d516b3b46f41cf07= d2633d23bde12 100644 --- a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c +++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c @@ -38,15 +38,16 @@ to_imx8mp_hdmi_pvi(struct drm_bridge *bridge) { return container_of(bridge, struct imx8mp_hdmi_pvi, bridge); } =20 static int imx8mp_hdmi_pvi_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct imx8mp_hdmi_pvi *pvi =3D to_imx8mp_hdmi_pvi(bridge); =20 - return drm_bridge_attach(bridge->encoder, pvi->next_bridge, + return drm_bridge_attach(encoder, pvi->next_bridge, bridge, flags); } =20 static void imx8mp_hdmi_pvi_bridge_enable(struct drm_bridge *bridge, struct drm_atomic_state *state) diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c b/drivers/= gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c index 1d9529dc7f2a93e7547ae1f4c6193598a5574135..1f6fd488e7039e943351006d337= 3009f0c15cb08 100644 --- a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c +++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c @@ -106,10 +106,11 @@ imx8qxp_pc_bridge_mode_valid(struct drm_bridge *bridg= e, =20 return MODE_OK; } =20 static int imx8qxp_pc_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct imx8qxp_pc_channel *ch =3D bridge->driver_private; struct imx8qxp_pc *pc =3D ch->pc; =20 @@ -117,11 +118,11 @@ static int imx8qxp_pc_bridge_attach(struct drm_bridge= *bridge, DRM_DEV_ERROR(pc->dev, "do not support creating a drm_connector\n"); return -EINVAL; } =20 - return drm_bridge_attach(bridge->encoder, + return drm_bridge_attach(encoder, ch->next_bridge, bridge, DRM_BRIDGE_ATTACH_NO_CONNECTOR); } =20 static void diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c b/drivers/gpu/= drm/bridge/imx/imx8qxp-pixel-link.c index cd6818db0fd332cac03241917bbb107b7261097c..e092c9ea99b0224802919ff84b4= 48acb53508951 100644 --- a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c +++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c @@ -126,21 +126,22 @@ static void imx8qxp_pixel_link_set_mst_addr(struct im= x8qxp_pixel_link *pl) "failed to set DC%u stream%u pixel link mst addr(%u): %d\n", pl->dc_id, pl->stream_id, pl->mst_addr, ret); } =20 static int imx8qxp_pixel_link_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct imx8qxp_pixel_link *pl =3D bridge->driver_private; =20 if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) { DRM_DEV_ERROR(pl->dev, "do not support creating a drm_connector\n"); return -EINVAL; } =20 - return drm_bridge_attach(bridge->encoder, + return drm_bridge_attach(encoder, pl->next_bridge, bridge, DRM_BRIDGE_ATTACH_NO_CONNECTOR); } =20 static void diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c b/drivers/gpu/drm= /bridge/imx/imx8qxp-pxl2dpi.c index 49dd4f96d52c966d9a038b0b04007631d0837f4d..da138ab51b3bd2c6ebd3780c098= 18891d5320092 100644 --- a/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c +++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c @@ -46,21 +46,22 @@ struct imx8qxp_pxl2dpi { }; =20 #define bridge_to_p2d(b) container_of(b, struct imx8qxp_pxl2dpi, bridge) =20 static int imx8qxp_pxl2dpi_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct imx8qxp_pxl2dpi *p2d =3D bridge->driver_private; =20 if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) { DRM_DEV_ERROR(p2d->dev, "do not support creating a drm_connector\n"); return -EINVAL; } =20 - return drm_bridge_attach(bridge->encoder, + return drm_bridge_attach(encoder, p2d->next_bridge, bridge, DRM_BRIDGE_ATTACH_NO_CONNECTOR); } =20 static int diff --git a/drivers/gpu/drm/bridge/ite-it6263.c b/drivers/gpu/drm/bridge/i= te-it6263.c index 21152a1c28f7f5e326794488f473b030219a2f65..a3a63a977b0a8487ad38fc08e0e= ed08672f4d41a 100644 --- a/drivers/gpu/drm/bridge/ite-it6263.c +++ b/drivers/gpu/drm/bridge/ite-it6263.c @@ -663,33 +663,34 @@ it6263_bridge_mode_valid(struct drm_bridge *bridge, =20 return bridge->funcs->hdmi_tmds_char_rate_valid(bridge, mode, rate); } =20 static int it6263_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct it6263 *it =3D bridge_to_it6263(bridge); struct drm_connector *connector; int ret; =20 - ret =3D drm_bridge_attach(bridge->encoder, it->next_bridge, bridge, + ret =3D drm_bridge_attach(encoder, it->next_bridge, bridge, flags | DRM_BRIDGE_ATTACH_NO_CONNECTOR); if (ret < 0) return ret; =20 if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) return 0; =20 - connector =3D drm_bridge_connector_init(bridge->dev, bridge->encoder); + connector =3D drm_bridge_connector_init(bridge->dev, encoder); if (IS_ERR(connector)) { ret =3D PTR_ERR(connector); dev_err(it->dev, "failed to initialize bridge connector: %d\n", ret); return ret; } =20 - drm_connector_attach_encoder(connector, bridge->encoder); + drm_connector_attach_encoder(connector, encoder); =20 return 0; } =20 static enum drm_connector_status it6263_bridge_detect(struct drm_bridge *b= ridge) diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/i= te-it6505.c index 8a607558ac89ed2961d13515d987c141f2b6e116..4e8b1dcba64fcf09ffd68d1a57d= ec5d30190ebe6 100644 --- a/drivers/gpu/drm/bridge/ite-it6505.c +++ b/drivers/gpu/drm/bridge/ite-it6505.c @@ -3122,10 +3122,11 @@ static inline struct it6505 *bridge_to_it6505(struc= t drm_bridge *bridge) { return container_of(bridge, struct it6505, bridge); } =20 static int it6505_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct it6505 *it6505 =3D bridge_to_it6505(bridge); struct device *dev =3D it6505->dev; int ret; diff --git a/drivers/gpu/drm/bridge/ite-it66121.c b/drivers/gpu/drm/bridge/= ite-it66121.c index b9f90f32145de0f17eadfdf0efbe95a2b5ca026d..7b110ae532918d2d6f91ebc5f74= 7c38e7e77dc07 100644 --- a/drivers/gpu/drm/bridge/ite-it66121.c +++ b/drivers/gpu/drm/bridge/ite-it66121.c @@ -584,19 +584,20 @@ static bool it66121_is_hpd_detect(struct it66121_ctx = *ctx) =20 return val & IT66121_SYS_STATUS_HPDETECT; } =20 static int it66121_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct it66121_ctx *ctx =3D container_of(bridge, struct it66121_ctx, brid= ge); int ret; =20 if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) return -EINVAL; =20 - ret =3D drm_bridge_attach(bridge->encoder, ctx->next_bridge, bridge, flag= s); + ret =3D drm_bridge_attach(encoder, ctx->next_bridge, bridge, flags); if (ret) return ret; =20 if (ctx->info->id =3D=3D ID_IT66121) { ret =3D regmap_write_bits(ctx->regmap, IT66121_CLK_BANK_REG, diff --git a/drivers/gpu/drm/bridge/lontium-lt8912b.c b/drivers/gpu/drm/bri= dge/lontium-lt8912b.c index 52da204f57404e63c7eadb4318b55082ae732105..3e49d855b3648880cea9bce5f3f= 04fbb6f838a45 100644 --- a/drivers/gpu/drm/bridge/lontium-lt8912b.c +++ b/drivers/gpu/drm/bridge/lontium-lt8912b.c @@ -541,16 +541,17 @@ static int lt8912_bridge_connector_init(struct drm_br= idge *bridge) exit: return ret; } =20 static int lt8912_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct lt8912 *lt =3D bridge_to_lt8912(bridge); int ret; =20 - ret =3D drm_bridge_attach(bridge->encoder, lt->hdmi_port, bridge, + ret =3D drm_bridge_attach(encoder, lt->hdmi_port, bridge, DRM_BRIDGE_ATTACH_NO_CONNECTOR); if (ret < 0) { dev_err(lt->dev, "Failed to attach next bridge (%d)\n", ret); return ret; } diff --git a/drivers/gpu/drm/bridge/lontium-lt9211.c b/drivers/gpu/drm/brid= ge/lontium-lt9211.c index 0fc5ea18fe6a8d0c1578dcae960d78cc33f4fb6d..9b2dac9bd63c5afd4ffbafafdbb= b1230549bc36f 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9211.c +++ b/drivers/gpu/drm/bridge/lontium-lt9211.c @@ -97,15 +97,16 @@ static struct lt9211 *bridge_to_lt9211(struct drm_bridg= e *bridge) { return container_of(bridge, struct lt9211, bridge); } =20 static int lt9211_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct lt9211 *ctx =3D bridge_to_lt9211(bridge); =20 - return drm_bridge_attach(bridge->encoder, ctx->panel_bridge, + return drm_bridge_attach(encoder, ctx->panel_bridge, &ctx->bridge, flags); } =20 static int lt9211_read_chipid(struct lt9211 *ctx) { diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/brid= ge/lontium-lt9611.c index 026803034231f78c17f619dc04119bdd9b2b6679..53987e826ccd3368e94a1d75633= 54d359ebcbb17 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9611.c +++ b/drivers/gpu/drm/bridge/lontium-lt9611.c @@ -738,15 +738,16 @@ static struct mipi_dsi_device *lt9611_attach_dsi(stru= ct lt9611 *lt9611, =20 return dsi; } =20 static int lt9611_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct lt9611 *lt9611 =3D bridge_to_lt9611(bridge); =20 - return drm_bridge_attach(bridge->encoder, lt9611->next_bridge, + return drm_bridge_attach(encoder, lt9611->next_bridge, bridge, flags); } =20 static enum drm_mode_status lt9611_bridge_mode_valid(struct drm_bridge *br= idge, const struct drm_display_info *info, diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c b/drivers/gpu/drm/b= ridge/lontium-lt9611uxc.c index f4c3ff1fdc6923eb7a8c0d8f7f92e7649c797d77..20bf1a3c786d8ecc10ac58225f2= 8e5c519fd1bf9 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c +++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c @@ -278,15 +278,16 @@ static struct mipi_dsi_device *lt9611uxc_attach_dsi(s= truct lt9611uxc *lt9611uxc, =20 return dsi; } =20 static int lt9611uxc_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct lt9611uxc *lt9611uxc =3D bridge_to_lt9611uxc(bridge); =20 - return drm_bridge_attach(bridge->encoder, lt9611uxc->next_bridge, + return drm_bridge_attach(encoder, lt9611uxc->next_bridge, bridge, flags); } =20 static enum drm_mode_status lt9611uxc_bridge_mode_valid(struct drm_bridge *bridge, diff --git a/drivers/gpu/drm/bridge/lvds-codec.c b/drivers/gpu/drm/bridge/l= vds-codec.c index 389af0233fcdec9af7a4fbfe8d267170fbc4759c..1646e454e0b0b558d00f9421f15= bb7084e2aa45a 100644 --- a/drivers/gpu/drm/bridge/lvds-codec.c +++ b/drivers/gpu/drm/bridge/lvds-codec.c @@ -32,15 +32,16 @@ static inline struct lvds_codec *to_lvds_codec(struct d= rm_bridge *bridge) { return container_of(bridge, struct lvds_codec, bridge); } =20 static int lvds_codec_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct lvds_codec *lvds_codec =3D to_lvds_codec(bridge); =20 - return drm_bridge_attach(bridge->encoder, lvds_codec->panel_bridge, + return drm_bridge_attach(encoder, lvds_codec->panel_bridge, bridge, flags); } =20 static void lvds_codec_enable(struct drm_bridge *bridge) { diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/dri= vers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c index a47aabf134fd5c78448eae50b14a5ec322e6d6d0..15a5a1f644fc10182c55bc9e489= ccb81d4f924f9 100644 --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c @@ -188,10 +188,11 @@ static irqreturn_t ge_b850v3_lvds_irq_handler(int irq= , void *dev_id) =20 return IRQ_HANDLED; } =20 static int ge_b850v3_lvds_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct i2c_client *stdp4028_i2c =3D ge_b850v3_lvds_ptr->stdp4028_i2c; =20 diff --git a/drivers/gpu/drm/bridge/microchip-lvds.c b/drivers/gpu/drm/brid= ge/microchip-lvds.c index 53dd140a1b8d1b333c1f932b4d205a028f818251..1d4ae0097df847d9f93c79eecff= 0c4587ae331ba 100644 --- a/drivers/gpu/drm/bridge/microchip-lvds.c +++ b/drivers/gpu/drm/bridge/microchip-lvds.c @@ -102,15 +102,16 @@ static void lvds_serialiser_on(struct mchp_lvds *lvds) /* Enable the LVDS serializer */ lvds_writel(lvds, LVDSC_CR, LVDSC_CR_SER_EN); } =20 static int mchp_lvds_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct mchp_lvds *lvds =3D bridge_to_lvds(bridge); =20 - return drm_bridge_attach(bridge->encoder, lvds->panel_bridge, + return drm_bridge_attach(encoder, lvds->panel_bridge, bridge, flags); } =20 static void mchp_lvds_enable(struct drm_bridge *bridge) { diff --git a/drivers/gpu/drm/bridge/nwl-dsi.c b/drivers/gpu/drm/bridge/nwl-= dsi.c index d04c62a0cb9f8ab6bbc1e3f6e49c3a5ba9cf9716..55912ae11f46a1d551e11f93a30= 6a8a00ef3f7d8 100644 --- a/drivers/gpu/drm/bridge/nwl-dsi.c +++ b/drivers/gpu/drm/bridge/nwl-dsi.c @@ -908,20 +908,21 @@ static void nwl_dsi_bridge_atomic_enable(struct drm_b= ridge *bridge, if (ret < 0) DRM_DEV_ERROR(dsi->dev, "Failed to deassert DPI: %d\n", ret); } =20 static int nwl_dsi_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct nwl_dsi *dsi =3D bridge_to_dsi(bridge); struct drm_bridge *panel_bridge; =20 panel_bridge =3D devm_drm_of_get_bridge(dsi->dev, dsi->dev->of_node, 1, 0= ); if (IS_ERR(panel_bridge)) return PTR_ERR(panel_bridge); =20 - return drm_bridge_attach(bridge->encoder, panel_bridge, bridge, flags); + return drm_bridge_attach(encoder, panel_bridge, bridge, flags); } =20 static u32 *nwl_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge, struct drm_bridge_state *bridge_state, struct drm_crtc_state *crtc_state, diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/= nxp-ptn3460.c index 27261b2ac9c83c311201b20f02aef7afeb6475b2..25d7c415478b14ef634bff4185a= 8dd8e866be0c6 100644 --- a/drivers/gpu/drm/bridge/nxp-ptn3460.c +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c @@ -212,17 +212,18 @@ static const struct drm_connector_funcs ptn3460_conne= ctor_funcs =3D { .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, }; =20 static int ptn3460_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct ptn3460_bridge *ptn_bridge =3D bridge_to_ptn3460(bridge); int ret; =20 /* Let this driver create connector if requested */ - ret =3D drm_bridge_attach(bridge->encoder, ptn_bridge->panel_bridge, + ret =3D drm_bridge_attach(encoder, ptn_bridge->panel_bridge, bridge, flags | DRM_BRIDGE_ATTACH_NO_CONNECTOR); if (ret < 0) return ret; =20 if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) @@ -237,11 +238,11 @@ static int ptn3460_bridge_attach(struct drm_bridge *b= ridge, } drm_connector_helper_add(&ptn_bridge->connector, &ptn3460_connector_helper_funcs); drm_connector_register(&ptn_bridge->connector); drm_connector_attach_encoder(&ptn_bridge->connector, - bridge->encoder); + encoder); =20 drm_helper_hpd_irq_event(ptn_bridge->connector.dev); =20 return ret; } diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c index 258c85c83a28349672d660dcf8b0b50bbbb824f8..79b009ab9396048eac57ad47631= a902e949d77c6 100644 --- a/drivers/gpu/drm/bridge/panel.c +++ b/drivers/gpu/drm/bridge/panel.c @@ -56,10 +56,11 @@ static const struct drm_connector_funcs panel_bridge_co= nnector_funcs =3D { .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, }; =20 static int panel_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct panel_bridge *panel_bridge =3D drm_bridge_to_panel_bridge(bridge); struct drm_connector *connector =3D &panel_bridge->connector; int ret; @@ -79,11 +80,11 @@ static int panel_bridge_attach(struct drm_bridge *bridg= e, } =20 drm_panel_bridge_set_orientation(connector, bridge); =20 drm_connector_attach_encoder(&panel_bridge->connector, - bridge->encoder); + encoder); =20 if (bridge->dev->registered) { if (connector->funcs->reset) connector->funcs->reset(connector); drm_connector_register(connector); diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridg= e/parade-ps8622.c index 13ada42a55142cd22696671e8fb363bee6d6aa68..8726fefc5c654e49bce029d943d= 241789ca4f802 100644 --- a/drivers/gpu/drm/bridge/parade-ps8622.c +++ b/drivers/gpu/drm/bridge/parade-ps8622.c @@ -416,10 +416,11 @@ static void ps8622_post_disable(struct drm_bridge *br= idge) =20 msleep(PS8622_POWER_OFF_T17_MS); } =20 static int ps8622_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct ps8622_bridge *ps8622 =3D bridge_to_ps8622(bridge); =20 return drm_bridge_attach(ps8622->bridge.encoder, ps8622->panel_bridge, diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridg= e/parade-ps8640.c index a42138b33258a48a303a97fbb07504893aeafaf7..2422ff68c1042bd8eaa6821ff38= 7d4faad47c550 100644 --- a/drivers/gpu/drm/bridge/parade-ps8640.c +++ b/drivers/gpu/drm/bridge/parade-ps8640.c @@ -492,10 +492,11 @@ static void ps8640_atomic_post_disable(struct drm_bri= dge *bridge, =20 mutex_unlock(&ps_bridge->aux_lock); } =20 static int ps8640_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct ps8640 *ps_bridge =3D bridge_to_ps8640(bridge); struct device *dev =3D &ps_bridge->page[0]->dev; int ret; @@ -516,11 +517,11 @@ static int ps8640_bridge_attach(struct drm_bridge *br= idge, ret =3D -EINVAL; goto err_devlink; } =20 /* Attach the panel-bridge to the dsi bridge */ - ret =3D drm_bridge_attach(bridge->encoder, ps_bridge->panel_bridge, + ret =3D drm_bridge_attach(encoder, ps_bridge->panel_bridge, &ps_bridge->bridge, flags); if (ret) goto err_bridge_attach; =20 return 0; diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge= /samsung-dsim.c index 54de6ed2fae81bc13301a6b1ee8f38183a3118b6..55ac6bd5da08c037aa7974df679= d51e72bc54faf 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1638,15 +1638,16 @@ static void samsung_dsim_mode_set(struct drm_bridge= *bridge, =20 drm_mode_copy(&dsi->mode, adjusted_mode); } =20 static int samsung_dsim_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct samsung_dsim *dsi =3D bridge_to_dsi(bridge); =20 - return drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, + return drm_bridge_attach(encoder, dsi->out_bridge, bridge, flags); } =20 static const struct drm_bridge_funcs samsung_dsim_bridge_funcs =3D { .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii9= 02x.c index 914a2609a685f7e853fde181fa22494bf9b5996f..6d185b7b0c3e9eda3154a8b7880= 819157bb1e53a 100644 --- a/drivers/gpu/drm/bridge/sii902x.c +++ b/drivers/gpu/drm/bridge/sii902x.c @@ -414,19 +414,20 @@ static void sii902x_bridge_mode_set(struct drm_bridge= *bridge, out: mutex_unlock(&sii902x->mutex); } =20 static int sii902x_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct sii902x *sii902x =3D bridge_to_sii902x(bridge); u32 bus_format =3D MEDIA_BUS_FMT_RGB888_1X24; struct drm_device *drm =3D bridge->dev; int ret; =20 if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) - return drm_bridge_attach(bridge->encoder, sii902x->next_bridge, + return drm_bridge_attach(encoder, sii902x->next_bridge, bridge, flags); =20 drm_connector_helper_add(&sii902x->connector, &sii902x_connector_helper_funcs); =20 @@ -450,11 +451,11 @@ static int sii902x_bridge_attach(struct drm_bridge *b= ridge, ret =3D drm_display_info_set_bus_formats(&sii902x->connector.display_info, &bus_format, 1); if (ret) return ret; =20 - drm_connector_attach_encoder(&sii902x->connector, bridge->encoder); + drm_connector_attach_encoder(&sii902x->connector, encoder); =20 return 0; } =20 static enum drm_connector_status sii902x_bridge_detect(struct drm_bridge *= bridge) diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/= sil-sii8620.c index 28a2e1ee04b2828364c6e633399b821562fc8728..3af650dc92a1612ca88fe378319= 519546b79901f 100644 --- a/drivers/gpu/drm/bridge/sil-sii8620.c +++ b/drivers/gpu/drm/bridge/sil-sii8620.c @@ -2201,10 +2201,11 @@ static inline struct sii8620 *bridge_to_sii8620(str= uct drm_bridge *bridge) { return container_of(bridge, struct sii8620, bridge); } =20 static int sii8620_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct sii8620 *ctx =3D bridge_to_sii8620(bridge); =20 sii8620_init_rcp_input_dev(ctx); diff --git a/drivers/gpu/drm/bridge/simple-bridge.c b/drivers/gpu/drm/bridg= e/simple-bridge.c index ab0b0e36e97ac244427ac316acd9230c9490f2ce..70db5b99e5bb84f099ec54cf62a= bbda53475311d 100644 --- a/drivers/gpu/drm/bridge/simple-bridge.c +++ b/drivers/gpu/drm/bridge/simple-bridge.c @@ -101,16 +101,17 @@ static const struct drm_connector_funcs simple_bridge= _con_funcs =3D { .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, }; =20 static int simple_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct simple_bridge *sbridge =3D drm_bridge_to_simple_bridge(bridge); int ret; =20 - ret =3D drm_bridge_attach(bridge->encoder, sbridge->next_bridge, bridge, + ret =3D drm_bridge_attach(encoder, sbridge->next_bridge, bridge, DRM_BRIDGE_ATTACH_NO_CONNECTOR); if (ret < 0) return ret; =20 if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) @@ -125,11 +126,11 @@ static int simple_bridge_attach(struct drm_bridge *br= idge, if (ret) { DRM_ERROR("Failed to initialize connector\n"); return ret; } =20 - drm_connector_attach_encoder(&sbridge->connector, bridge->encoder); + drm_connector_attach_encoder(&sbridge->connector, encoder); =20 return 0; } =20 static void simple_bridge_enable(struct drm_bridge *bridge) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/br= idge/synopsys/dw-hdmi.c index 0890add5f7070f13fefad923526e92f516f06764..b1cdf806b3c4007dfef09c632fe= a354f7f6001b5 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -2887,16 +2887,17 @@ static int dw_hdmi_bridge_atomic_check(struct drm_b= ridge *bridge, =20 return 0; } =20 static int dw_hdmi_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct dw_hdmi *hdmi =3D bridge->driver_private; =20 if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) - return drm_bridge_attach(bridge->encoder, hdmi->next_bridge, + return drm_bridge_attach(encoder, hdmi->next_bridge, bridge, flags); =20 return dw_hdmi_connector_create(hdmi); } =20 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/dr= m/bridge/synopsys/dw-mipi-dsi.c index 2b6e70a49f438c475bc60d9595bf246a9e54995b..b08ada920a501d6a62f39581944= a87019f5e5c15 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c @@ -1070,19 +1070,20 @@ dw_mipi_dsi_bridge_mode_valid(struct drm_bridge *br= idge, =20 return mode_status; } =20 static int dw_mipi_dsi_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct dw_mipi_dsi *dsi =3D bridge_to_dsi(bridge); =20 /* Set the encoder type as caller does not know it */ - bridge->encoder->encoder_type =3D DRM_MODE_ENCODER_DSI; + encoder->encoder_type =3D DRM_MODE_ENCODER_DSI; =20 /* Attach the panel-bridge to the dsi bridge */ - return drm_bridge_attach(bridge->encoder, dsi->panel_bridge, bridge, + return drm_bridge_attach(encoder, dsi->panel_bridge, bridge, flags); } =20 static const struct drm_bridge_funcs dw_mipi_dsi_bridge_funcs =3D { .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c b/drivers/gpu/d= rm/bridge/synopsys/dw-mipi-dsi2.c index 5fd7a459efdd4fc4884cdf77ffedc19c36d1ca13..c76f5f2e74d14bd372f969c6c78= 32aa57f80772b 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c @@ -868,19 +868,20 @@ dw_mipi_dsi2_bridge_mode_valid(struct drm_bridge *bri= dge, =20 return mode_status; } =20 static int dw_mipi_dsi2_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct dw_mipi_dsi2 *dsi2 =3D bridge_to_dsi2(bridge); =20 /* Set the encoder type as caller does not know it */ - bridge->encoder->encoder_type =3D DRM_MODE_ENCODER_DSI; + encoder->encoder_type =3D DRM_MODE_ENCODER_DSI; =20 /* Attach the panel-bridge to the dsi bridge */ - return drm_bridge_attach(bridge->encoder, dsi2->panel_bridge, bridge, + return drm_bridge_attach(encoder, dsi2->panel_bridge, bridge, flags); } =20 static const struct drm_bridge_funcs dw_mipi_dsi2_bridge_funcs =3D { .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, diff --git a/drivers/gpu/drm/bridge/tc358762.c b/drivers/gpu/drm/bridge/tc3= 58762.c index 49c76027f8316967ea4f7d7dfb85920a025b6df9..edf01476f2ef6e05ef2c144ff44= 67e7f6babc4c6 100644 --- a/drivers/gpu/drm/bridge/tc358762.c +++ b/drivers/gpu/drm/bridge/tc358762.c @@ -200,15 +200,16 @@ static void tc358762_enable(struct drm_bridge *bridge, if (ret < 0) dev_err(ctx->dev, "error initializing bridge (%d)\n", ret); } =20 static int tc358762_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct tc358762 *ctx =3D bridge_to_tc358762(bridge); =20 - return drm_bridge_attach(bridge->encoder, ctx->panel_bridge, + return drm_bridge_attach(encoder, ctx->panel_bridge, bridge, flags); } =20 static void tc358762_bridge_mode_set(struct drm_bridge *bridge, const struct drm_display_mode *mode, diff --git a/drivers/gpu/drm/bridge/tc358764.c b/drivers/gpu/drm/bridge/tc3= 58764.c index 3d3d135b43487aaf5a1908c21c1c988e87d24d48..3f76c890fad9ffa50dc02f289a3= 7378332830516 100644 --- a/drivers/gpu/drm/bridge/tc358764.c +++ b/drivers/gpu/drm/bridge/tc358764.c @@ -293,15 +293,16 @@ static void tc358764_pre_enable(struct drm_bridge *br= idge) if (ret < 0) dev_err(ctx->dev, "error initializing bridge (%d)\n", ret); } =20 static int tc358764_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct tc358764 *ctx =3D bridge_to_tc358764(bridge); =20 - return drm_bridge_attach(bridge->encoder, ctx->next_bridge, bridge, flags= ); + return drm_bridge_attach(encoder, ctx->next_bridge, bridge, flags); } =20 static const struct drm_bridge_funcs tc358764_bridge_funcs =3D { .post_disable =3D tc358764_post_disable, .pre_enable =3D tc358764_pre_enable, diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc3= 58767.c index 39e2d3a7a27d2603bb847d55c4812fb170389ba0..7e5449fb86a3fcdae8255bc490d= 12c543ef3f8ae 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -1793,10 +1793,11 @@ static const struct drm_connector_funcs tc_connecto= r_funcs =3D { .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, }; =20 static int tc_dpi_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct tc_data *tc =3D bridge_to_tc(bridge); =20 if (!tc->panel_bridge) @@ -1805,10 +1806,11 @@ static int tc_dpi_bridge_attach(struct drm_bridge *= bridge, return drm_bridge_attach(tc->bridge.encoder, tc->panel_bridge, &tc->bridge, flags); } =20 static int tc_edp_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { u32 bus_format =3D MEDIA_BUS_FMT_RGB888_1X24; struct tc_data *tc =3D bridge_to_tc(bridge); struct drm_device *drm =3D bridge->dev; diff --git a/drivers/gpu/drm/bridge/tc358768.c b/drivers/gpu/drm/bridge/tc3= 58768.c index ec79b0dd0e2cd6dfbdd8aee54d6a8d9cf8bfb060..6db18d1e8824dd7d387211d6d1e= 668645cf88bbe 100644 --- a/drivers/gpu/drm/bridge/tc358768.c +++ b/drivers/gpu/drm/bridge/tc358768.c @@ -552,20 +552,21 @@ static const struct mipi_dsi_host_ops tc358768_dsi_ho= st_ops =3D { .detach =3D tc358768_dsi_host_detach, .transfer =3D tc358768_dsi_host_transfer, }; =20 static int tc358768_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct tc358768_priv *priv =3D bridge_to_tc358768(bridge); =20 if (!drm_core_check_feature(bridge->dev, DRIVER_ATOMIC)) { dev_err(priv->dev, "needs atomic updates support\n"); return -ENOTSUPP; } =20 - return drm_bridge_attach(bridge->encoder, priv->output.bridge, bridge, + return drm_bridge_attach(encoder, priv->output.bridge, bridge, flags); } =20 static enum drm_mode_status tc358768_bridge_mode_valid(struct drm_bridge *bridge, diff --git a/drivers/gpu/drm/bridge/tc358775.c b/drivers/gpu/drm/bridge/tc3= 58775.c index c89757bec4e6cc59ea0e84b1096ba71b077d408e..13cd48e77d2d3f8dd646078fb7d= e95c420f29f73 100644 --- a/drivers/gpu/drm/bridge/tc358775.c +++ b/drivers/gpu/drm/bridge/tc358775.c @@ -587,16 +587,17 @@ static int tc358775_parse_dt(struct device_node *np, = struct tc_data *tc) =20 return 0; } =20 static int tc_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct tc_data *tc =3D bridge_to_tc(bridge); =20 /* Attach the panel-bridge to the dsi bridge */ - return drm_bridge_attach(bridge->encoder, tc->panel_bridge, + return drm_bridge_attach(encoder, tc->panel_bridge, &tc->bridge, flags); } =20 static const struct drm_bridge_funcs tc_bridge_funcs =3D { .attach =3D tc_bridge_attach, diff --git a/drivers/gpu/drm/bridge/tda998x_drv.c b/drivers/gpu/drm/bridge/= tda998x_drv.c index ebc758c72891188e236d4da0cde283f108d80aca..9c5bb2a1676986c89f47e23fe33= dfa391a3de30a 100644 --- a/drivers/gpu/drm/bridge/tda998x_drv.c +++ b/drivers/gpu/drm/bridge/tda998x_drv.c @@ -1363,10 +1363,11 @@ static int tda998x_connector_init(struct tda998x_pr= iv *priv, } =20 /* DRM bridge functions */ =20 static int tda998x_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct tda998x_priv *priv =3D bridge_to_tda998x_priv(bridge); =20 if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { diff --git a/drivers/gpu/drm/bridge/thc63lvd1024.c b/drivers/gpu/drm/bridge= /thc63lvd1024.c index bba10cf9b4f96aef69f82403a7642d08c2b9f4b7..e2fc78adebcf22f0d8cdb484078= e37b748b776c6 100644 --- a/drivers/gpu/drm/bridge/thc63lvd1024.c +++ b/drivers/gpu/drm/bridge/thc63lvd1024.c @@ -41,15 +41,16 @@ static inline struct thc63_dev *to_thc63(struct drm_bri= dge *bridge) { return container_of(bridge, struct thc63_dev, bridge); } =20 static int thc63_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct thc63_dev *thc63 =3D to_thc63(bridge); =20 - return drm_bridge_attach(bridge->encoder, thc63->next, bridge, flags); + return drm_bridge_attach(encoder, thc63->next, bridge, flags); } =20 static enum drm_mode_status thc63_mode_valid(struct drm_bridge *bridge, const struct drm_display_info *info, const struct drm_display_mode *mode) diff --git a/drivers/gpu/drm/bridge/ti-dlpc3433.c b/drivers/gpu/drm/bridge/= ti-dlpc3433.c index 85f2a0e74a1c8aaa272ce828ad1c82660503b7a8..47638d1c96ec5ad999604c8c7e8= 839ff85936d98 100644 --- a/drivers/gpu/drm/bridge/ti-dlpc3433.c +++ b/drivers/gpu/drm/bridge/ti-dlpc3433.c @@ -240,16 +240,16 @@ static void dlpc_mode_set(struct drm_bridge *bridge, struct dlpc *dlpc =3D bridge_to_dlpc(bridge); =20 drm_mode_copy(&dlpc->mode, adjusted_mode); } =20 -static int dlpc_attach(struct drm_bridge *bridge, +static int dlpc_attach(struct drm_bridge *bridge, struct drm_encoder *enco= der, enum drm_bridge_attach_flags flags) { struct dlpc *dlpc =3D bridge_to_dlpc(bridge); =20 - return drm_bridge_attach(bridge->encoder, dlpc->next_bridge, bridge, flag= s); + return drm_bridge_attach(encoder, dlpc->next_bridge, bridge, flags); } =20 static const struct drm_bridge_funcs dlpc_bridge_funcs =3D { .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_bridge_destroy_state, diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi83.c b/drivers/gpu/drm/bridge= /ti-sn65dsi83.c index 95563aa1b450d549be8cacbe58c45f07b93595e5..7122a3ebd88399ed32420fcaf9f= 1f9384d031d2d 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi83.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi83.c @@ -288,15 +288,16 @@ static struct sn65dsi83 *bridge_to_sn65dsi83(struct d= rm_bridge *bridge) { return container_of(bridge, struct sn65dsi83, bridge); } =20 static int sn65dsi83_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct sn65dsi83 *ctx =3D bridge_to_sn65dsi83(bridge); =20 - return drm_bridge_attach(bridge->encoder, ctx->panel_bridge, + return drm_bridge_attach(encoder, ctx->panel_bridge, &ctx->bridge, flags); } =20 static void sn65dsi83_detach(struct drm_bridge *bridge) { diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge= /ti-sn65dsi86.c index 01d456b955abbb2cca65c222bf7a24d6f1697d02..190929a41abd1d8d6619e27bb93= 91f75145ed64a 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c @@ -730,10 +730,11 @@ static int ti_sn_attach_host(struct auxiliary_device = *adev, struct ti_sn65dsi86 =20 return devm_mipi_dsi_attach(&adev->dev, dsi); } =20 static int ti_sn_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct ti_sn65dsi86 *pdata =3D bridge_to_ti_sn65dsi86(bridge); int ret; =20 @@ -746,11 +747,11 @@ static int ti_sn_bridge_attach(struct drm_bridge *bri= dge, =20 /* * Attach the next bridge. * We never want the next bridge to *also* create a connector. */ - ret =3D drm_bridge_attach(bridge->encoder, pdata->next_bridge, + ret =3D drm_bridge_attach(encoder, pdata->next_bridge, &pdata->bridge, flags | DRM_BRIDGE_ATTACH_NO_CONNECTOR); if (ret < 0) goto err_initted_aux; =20 if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) diff --git a/drivers/gpu/drm/bridge/ti-tdp158.c b/drivers/gpu/drm/bridge/ti= -tdp158.c index 22316382451fa3a55e1b3977982bd306b52b5888..cca75443f0121e39527a6cecf71= 1eff2c0d507b5 100644 --- a/drivers/gpu/drm/bridge/ti-tdp158.c +++ b/drivers/gpu/drm/bridge/ti-tdp158.c @@ -43,15 +43,17 @@ static void tdp158_disable(struct drm_bridge *bridge, gpiod_set_value_cansleep(tdp158->enable, 0); regulator_disable(tdp158->vdd); regulator_disable(tdp158->vcc); } =20 -static int tdp158_attach(struct drm_bridge *bridge, enum drm_bridge_attach= _flags flags) +static int tdp158_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, + enum drm_bridge_attach_flags flags) { struct tdp158 *tdp158 =3D bridge->driver_private; =20 - return drm_bridge_attach(bridge->encoder, tdp158->next, bridge, flags); + return drm_bridge_attach(encoder, tdp158->next, bridge, flags); } =20 static const struct drm_bridge_funcs tdp158_bridge_funcs =3D { .attach =3D tdp158_attach, .atomic_enable =3D tdp158_enable, diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti= -tfp410.c index 79ab5da827e1fd3850435a02daedad87186a4ab8..e15d232ddbac55c6f5f966471a6= c63f9c29a06c1 100644 --- a/drivers/gpu/drm/bridge/ti-tfp410.c +++ b/drivers/gpu/drm/bridge/ti-tfp410.c @@ -118,16 +118,17 @@ static void tfp410_hpd_callback(void *arg, enum drm_c= onnector_status status) mod_delayed_work(system_wq, &dvi->hpd_work, msecs_to_jiffies(HOTPLUG_DEBOUNCE_MS)); } =20 static int tfp410_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct tfp410 *dvi =3D drm_bridge_to_tfp410(bridge); int ret; =20 - ret =3D drm_bridge_attach(bridge->encoder, dvi->next_bridge, bridge, + ret =3D drm_bridge_attach(encoder, dvi->next_bridge, bridge, DRM_BRIDGE_ATTACH_NO_CONNECTOR); if (ret < 0) return ret; =20 if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) @@ -157,11 +158,11 @@ static int tfp410_attach(struct drm_bridge *bridge, } =20 drm_display_info_set_bus_formats(&dvi->connector.display_info, &dvi->bus_format, 1); =20 - drm_connector_attach_encoder(&dvi->connector, bridge->encoder); + drm_connector_attach_encoder(&dvi->connector, encoder); =20 return 0; } =20 static void tfp410_detach(struct drm_bridge *bridge) diff --git a/drivers/gpu/drm/bridge/ti-tpd12s015.c b/drivers/gpu/drm/bridge= /ti-tpd12s015.c index 47b74cb25b14fcf4a09137d8b5b7f4ff739eae59..1c289051a5987e0aec4c286ef4c= 01ee1a2f9421f 100644 --- a/drivers/gpu/drm/bridge/ti-tpd12s015.c +++ b/drivers/gpu/drm/bridge/ti-tpd12s015.c @@ -36,19 +36,20 @@ static inline struct tpd12s015_device *to_tpd12s015(str= uct drm_bridge *bridge) { return container_of(bridge, struct tpd12s015_device, bridge); } =20 static int tpd12s015_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct tpd12s015_device *tpd =3D to_tpd12s015(bridge); int ret; =20 if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) return -EINVAL; =20 - ret =3D drm_bridge_attach(bridge->encoder, tpd->next_bridge, + ret =3D drm_bridge_attach(encoder, tpd->next_bridge, bridge, flags); if (ret < 0) return ret; =20 gpiod_set_value_cansleep(tpd->ls_oe_gpio, 1); diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index ea9525ec16b5272d12a21a66913ada38e74e80bc..5bdce9db4475c9699bec11b1e4c= 0615af028b33d 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -326,11 +326,11 @@ int drm_bridge_attach(struct drm_encoder *encoder, st= ruct drm_bridge *bridge, list_add(&bridge->chain_node, &previous->chain_node); else list_add(&bridge->chain_node, &encoder->bridge_chain); =20 if (bridge->funcs->attach) { - ret =3D bridge->funcs->attach(bridge, flags); + ret =3D bridge->funcs->attach(bridge, encoder, flags); if (ret < 0) goto err_reset_bridge; } =20 if (bridge->funcs->atomic_reset) { diff --git a/drivers/gpu/drm/imx/ipuv3/parallel-display.c b/drivers/gpu/drm= /imx/ipuv3/parallel-display.c index 9e66eb77b1ebe853599a60df69ce8db94fdffd49..6d8325c766979aa3ba98970f008= 06e99c139d3c3 100644 --- a/drivers/gpu/drm/imx/ipuv3/parallel-display.c +++ b/drivers/gpu/drm/imx/ipuv3/parallel-display.c @@ -160,15 +160,16 @@ static int imx_pd_bridge_atomic_check(struct drm_brid= ge *bridge, =20 return 0; } =20 static int imx_pd_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct imx_parallel_display *imxpd =3D bridge_to_imxpd(bridge); =20 - return drm_bridge_attach(bridge->encoder, imxpd->next_bridge, bridge, fla= gs); + return drm_bridge_attach(encoder, imxpd->next_bridge, bridge, flags); } =20 static const struct drm_bridge_funcs imx_pd_bridge_funcs =3D { .attach =3D imx_pd_bridge_attach, .atomic_reset =3D drm_atomic_helper_bridge_reset, diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/in= genic/ingenic-drm-drv.c index 20b93fff023995062096941ae571756185688387..f851e9ffdb280388452c9ad0883= 932f5b990d6f0 100644 --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c @@ -789,15 +789,16 @@ static void ingenic_drm_encoder_atomic_mode_set(struc= t drm_encoder *encoder, regmap_write(priv->map, JZ_REG_LCD_CFG, cfg); regmap_write(priv->map, JZ_REG_LCD_RGBC, rgbcfg); } =20 static int ingenic_drm_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { - struct ingenic_drm_bridge *ib =3D to_ingenic_drm_bridge(bridge->encoder); + struct ingenic_drm_bridge *ib =3D to_ingenic_drm_bridge(encoder); =20 - return drm_bridge_attach(bridge->encoder, ib->next_bridge, + return drm_bridge_attach(encoder, ib->next_bridge, &ib->bridge, flags); } =20 static int ingenic_drm_bridge_atomic_check(struct drm_bridge *bridge, struct drm_bridge_state *bridge_state, diff --git a/drivers/gpu/drm/mcde/mcde_dsi.c b/drivers/gpu/drm/mcde/mcde_ds= i.c index 395449a72f0a1dc0d8ee97ecd245ca52f0282402..b302d8ec3ad0e82ace9c10194ae= 37948ebb8e753 100644 --- a/drivers/gpu/drm/mcde/mcde_dsi.c +++ b/drivers/gpu/drm/mcde/mcde_dsi.c @@ -1046,10 +1046,11 @@ void mcde_dsi_disable(struct drm_bridge *bridge) clk_disable_unprepare(d->hs_clk); clk_disable_unprepare(d->lp_clk); } =20 static int mcde_dsi_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct mcde_dsi *d =3D bridge_to_mcde_dsi(bridge); struct drm_device *drm =3D bridge->dev; =20 @@ -1057,11 +1058,11 @@ static int mcde_dsi_bridge_attach(struct drm_bridge= *bridge, dev_err(d->dev, "we need atomic updates\n"); return -ENOTSUPP; } =20 /* Attach the DSI bridge to the output (panel etc) bridge */ - return drm_bridge_attach(bridge->encoder, d->bridge_out, bridge, flags); + return drm_bridge_attach(encoder, d->bridge_out, bridge, flags); } =20 static const struct drm_bridge_funcs mcde_dsi_bridge_funcs =3D { .attach =3D mcde_dsi_bridge_attach, .mode_set =3D mcde_dsi_bridge_mode_set, diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/m= tk_dp.c index 3d4648d2e15f1a1a3c6ae596e1a35cd654fcc35c..4523cc0a2db8cd8b57183e11140= b8a6584e95a34 100644 --- a/drivers/gpu/drm/mediatek/mtk_dp.c +++ b/drivers/gpu/drm/mediatek/mtk_dp.c @@ -2285,10 +2285,11 @@ static void mtk_dp_poweroff(struct mtk_dp *mtk_dp) mtk_dp_power_disable(mtk_dp); phy_exit(mtk_dp->phy); } =20 static int mtk_dp_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct mtk_dp *mtk_dp =3D mtk_dp_from_bridge(bridge); int ret; =20 @@ -2308,11 +2309,11 @@ static int mtk_dp_bridge_attach(struct drm_bridge *= bridge, ret =3D mtk_dp_poweron(mtk_dp); if (ret) goto err_aux_register; =20 if (mtk_dp->next_bridge) { - ret =3D drm_bridge_attach(bridge->encoder, mtk_dp->next_bridge, + ret =3D drm_bridge_attach(encoder, mtk_dp->next_bridge, &mtk_dp->bridge, flags); if (ret) { drm_warn(mtk_dp->drm_dev, "Failed to attach external bridge: %d\n", ret); goto err_bridge_attach; diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/= mtk_dpi.c index 1864eb02dbf50af09c65064834a8b27ca56c3528..6b96ed4fc8614569e53f76fe3e5= 2507c7dc1249c 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -699,10 +699,11 @@ static int mtk_dpi_bridge_atomic_check(struct drm_bri= dge *bridge, =20 return 0; } =20 static int mtk_dpi_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct mtk_dpi *dpi =3D bridge_to_dpi(bridge); int ret; =20 @@ -717,11 +718,11 @@ static int mtk_dpi_bridge_attach(struct drm_bridge *b= ridge, if (IS_ERR(dpi->next_bridge)) return dev_err_probe(dpi->dev, PTR_ERR(dpi->next_bridge), "Failed to get bridge\n"); } =20 - return drm_bridge_attach(bridge->encoder, dpi->next_bridge, + return drm_bridge_attach(encoder, dpi->next_bridge, &dpi->bridge, flags); } =20 static void mtk_dpi_bridge_mode_set(struct drm_bridge *bridge, const struct drm_display_mode *mode, diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/= mtk_dsi.c index 0683c2b3ca5bc5b09439c42d30fb1380e1c67c97..cd2fbd8487c55930bf3abd1c313= 1153469e5166a 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -805,16 +805,17 @@ static void mtk_output_dsi_disable(struct mtk_dsi *ds= i) =20 dsi->enabled =3D false; } =20 static int mtk_dsi_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct mtk_dsi *dsi =3D bridge_to_dsi(bridge); =20 /* Attach the panel or bridge to the dsi bridge */ - return drm_bridge_attach(bridge->encoder, dsi->next_bridge, + return drm_bridge_attach(encoder, dsi->next_bridge, &dsi->bridge, flags); } =20 static void mtk_dsi_bridge_mode_set(struct drm_bridge *bridge, const struct drm_display_mode *mode, diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek= /mtk_hdmi.c index d4ab098e117477eea8fad568a134c0a796b380db..e753b8e2d91b9471df00678c5ad= 66e6adec6c36d 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -1276,10 +1276,11 @@ static const struct drm_edid *mtk_hdmi_bridge_edid_= read(struct drm_bridge *bridg =20 return drm_edid; } =20 static int mtk_hdmi_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct mtk_hdmi *hdmi =3D hdmi_ctx_from_bridge(bridge); int ret; =20 @@ -1288,11 +1289,11 @@ static int mtk_hdmi_bridge_attach(struct drm_bridge= *bridge, __func__); return -EINVAL; } =20 if (hdmi->next_bridge) { - ret =3D drm_bridge_attach(bridge->encoder, hdmi->next_bridge, + ret =3D drm_bridge_attach(encoder, hdmi->next_bridge, bridge, flags); if (ret) return ret; } =20 diff --git a/drivers/gpu/drm/meson/meson_encoder_cvbs.c b/drivers/gpu/drm/m= eson/meson_encoder_cvbs.c index e79f7c3ce32efa8e5fe7afe274fe991ac363b734..c9678dc68fa142882e2beb24fe8= 1185fbdef733b 100644 --- a/drivers/gpu/drm/meson/meson_encoder_cvbs.c +++ b/drivers/gpu/drm/meson/meson_encoder_cvbs.c @@ -81,16 +81,17 @@ meson_cvbs_get_mode(const struct drm_display_mode *req_= mode) =20 return NULL; } =20 static int meson_encoder_cvbs_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct meson_encoder_cvbs *meson_encoder_cvbs =3D bridge_to_meson_encoder_cvbs(bridge); =20 - return drm_bridge_attach(bridge->encoder, meson_encoder_cvbs->next_bridge, + return drm_bridge_attach(encoder, meson_encoder_cvbs->next_bridge, &meson_encoder_cvbs->bridge, flags); } =20 static int meson_encoder_cvbs_get_modes(struct drm_bridge *bridge, struct drm_connector *connector) diff --git a/drivers/gpu/drm/meson/meson_encoder_dsi.c b/drivers/gpu/drm/me= son/meson_encoder_dsi.c index fe204437bd6576a258dc11319e2b905f170a24a1..3db518e5f95d324c218b730e094= 8c3dc845382bd 100644 --- a/drivers/gpu/drm/meson/meson_encoder_dsi.c +++ b/drivers/gpu/drm/meson/meson_encoder_dsi.c @@ -31,15 +31,16 @@ struct meson_encoder_dsi { =20 #define bridge_to_meson_encoder_dsi(x) \ container_of(x, struct meson_encoder_dsi, bridge) =20 static int meson_encoder_dsi_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct meson_encoder_dsi *encoder_dsi =3D bridge_to_meson_encoder_dsi(bri= dge); =20 - return drm_bridge_attach(bridge->encoder, encoder_dsi->next_bridge, + return drm_bridge_attach(encoder, encoder_dsi->next_bridge, &encoder_dsi->bridge, flags); } =20 static void meson_encoder_dsi_atomic_enable(struct drm_bridge *bridge, struct drm_atomic_state *state) diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/m= eson/meson_encoder_hdmi.c index 6d1c9262a2cfb7b08a68efb86821bf5ecf8c0941..5f02695aafd1aa8444cd936a36e= 8f3a8010881a0 100644 --- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c +++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c @@ -47,15 +47,16 @@ struct meson_encoder_hdmi { =20 #define bridge_to_meson_encoder_hdmi(x) \ container_of(x, struct meson_encoder_hdmi, bridge) =20 static int meson_encoder_hdmi_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct meson_encoder_hdmi *encoder_hdmi =3D bridge_to_meson_encoder_hdmi(= bridge); =20 - return drm_bridge_attach(bridge->encoder, encoder_hdmi->next_bridge, + return drm_bridge_attach(encoder, encoder_hdmi->next_bridge, &encoder_hdmi->bridge, flags); } =20 static void meson_encoder_hdmi_detach(struct drm_bridge *bridge) { diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/ds= i/dsi_manager.c index a210b7c9e5ca281a46fbdb226e25832719a684ea..895ba9815a652f00f7ace9cb712= 5ef8cef555d35 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c @@ -422,16 +422,17 @@ static enum drm_mode_status dsi_mgr_bridge_mode_valid= (struct drm_bridge *bridge, =20 return msm_dsi_host_check_dsc(host, mode); } =20 static int dsi_mgr_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { int id =3D dsi_mgr_bridge_get_id(bridge); struct msm_dsi *msm_dsi =3D dsi_mgr_get_dsi(id); =20 - return drm_bridge_attach(bridge->encoder, msm_dsi->next_bridge, + return drm_bridge_attach(encoder, msm_dsi->next_bridge, bridge, flags); } =20 static const struct drm_bridge_funcs dsi_mgr_bridge_funcs =3D { .attach =3D dsi_mgr_bridge_attach, diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/ds= s/dpi.c index b17e77f700ddda6c9972e5ff10d394fd72bf96b3..6eff97a091602f6d137095b3b7b= f54fce17e8d3e 100644 --- a/drivers/gpu/drm/omapdrm/dss/dpi.c +++ b/drivers/gpu/drm/omapdrm/dss/dpi.c @@ -418,20 +418,21 @@ static void dpi_init_pll(struct dpi_data *dpi) /* -----------------------------------------------------------------------= ------ * DRM Bridge Operations */ =20 static int dpi_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct dpi_data *dpi =3D drm_bridge_to_dpi(bridge); =20 if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) return -EINVAL; =20 dpi_init_pll(dpi); =20 - return drm_bridge_attach(bridge->encoder, dpi->output.next_bridge, + return drm_bridge_attach(encoder, dpi->output.next_bridge, bridge, flags); } =20 static enum drm_mode_status dpi_bridge_mode_valid(struct drm_bridge *bridge, diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/ds= s/dsi.c index 59d20eb8a7e0fdcc13060d00980452bc80c54eb2..35e3e332bdcf4cf69659de65dee= ea0f5dbd70358 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -4615,18 +4615,19 @@ static const struct component_ops dsi_component_ops= =3D { /* -----------------------------------------------------------------------= ------ * DRM Bridge Operations */ =20 static int dsi_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct dsi_data *dsi =3D drm_bridge_to_dsi(bridge); =20 if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) return -EINVAL; =20 - return drm_bridge_attach(bridge->encoder, dsi->output.next_bridge, + return drm_bridge_attach(encoder, dsi->output.next_bridge, bridge, flags); } =20 static enum drm_mode_status dsi_bridge_mode_valid(struct drm_bridge *bridge, diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/= dss/hdmi4.c index e1ac447221ee5ae5ee50637acfc8a30a8f111850..a3b22952fdc32b5899dae82d413= 108c5c0a1c3c8 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c @@ -312,18 +312,19 @@ void hdmi4_core_disable(struct hdmi_core_data *core) /* -----------------------------------------------------------------------= ------ * DRM Bridge Operations */ =20 static int hdmi4_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct omap_hdmi *hdmi =3D drm_bridge_to_hdmi(bridge); =20 if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) return -EINVAL; =20 - return drm_bridge_attach(bridge->encoder, hdmi->output.next_bridge, + return drm_bridge_attach(encoder, hdmi->output.next_bridge, bridge, flags); } =20 static void hdmi4_bridge_mode_set(struct drm_bridge *bridge, const struct drm_display_mode *mode, diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/= dss/hdmi5.c index fa9904e4c218235bafa87be600680b3e5d5e2ea5..0c98444d39a93d8336b4d8dbd45= aa4521181c3b4 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c @@ -310,18 +310,19 @@ static void hdmi_core_disable(struct omap_hdmi *hdmi) /* -----------------------------------------------------------------------= ------ * DRM Bridge Operations */ =20 static int hdmi5_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct omap_hdmi *hdmi =3D drm_bridge_to_hdmi(bridge); =20 if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) return -EINVAL; =20 - return drm_bridge_attach(bridge->encoder, hdmi->output.next_bridge, + return drm_bridge_attach(encoder, hdmi->output.next_bridge, bridge, flags); } =20 static void hdmi5_bridge_mode_set(struct drm_bridge *bridge, const struct drm_display_mode *mode, diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/ds= s/sdi.c index f9ae358e8e52145b3832b18286ba4834f3c2d8db..e78826e4b560a2b9af2d8a5a38e= 181bd3e44d250 100644 --- a/drivers/gpu/drm/omapdrm/dss/sdi.c +++ b/drivers/gpu/drm/omapdrm/dss/sdi.c @@ -126,18 +126,19 @@ static void sdi_config_lcd_manager(struct sdi_device = *sdi) /* -----------------------------------------------------------------------= ------ * DRM Bridge Operations */ =20 static int sdi_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct sdi_device *sdi =3D drm_bridge_to_sdi(bridge); =20 if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) return -EINVAL; =20 - return drm_bridge_attach(bridge->encoder, sdi->output.next_bridge, + return drm_bridge_attach(encoder, sdi->output.next_bridge, bridge, flags); } =20 static enum drm_mode_status sdi_bridge_mode_valid(struct drm_bridge *bridge, diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/d= ss/venc.c index aaeef603682c25773f2f809d8ac04f64cba5fb21..50349518eda1630400529caf27c= a4469bb09fc82 100644 --- a/drivers/gpu/drm/omapdrm/dss/venc.c +++ b/drivers/gpu/drm/omapdrm/dss/venc.c @@ -536,18 +536,19 @@ static int venc_get_clocks(struct venc_device *venc) /* -----------------------------------------------------------------------= ------ * DRM Bridge Operations */ =20 static int venc_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct venc_device *venc =3D drm_bridge_to_venc(bridge); =20 if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) return -EINVAL; =20 - return drm_bridge_attach(bridge->encoder, venc->output.next_bridge, + return drm_bridge_attach(encoder, venc->output.next_bridge, bridge, flags); } =20 static enum drm_mode_status venc_bridge_mode_valid(struct drm_bridge *bridge, diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_lvds.c b/drivers/gpu/drm/= renesas/rcar-du/rcar_lvds.c index 380a855b832af9c09652ce39a78f974b63d949bb..a9145253294fcaef6bae4e1406a= 781f6d710d357 100644 --- a/drivers/gpu/drm/renesas/rcar-du/rcar_lvds.c +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_lvds.c @@ -632,18 +632,19 @@ static bool rcar_lvds_mode_fixup(struct drm_bridge *b= ridge, =20 return true; } =20 static int rcar_lvds_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct rcar_lvds *lvds =3D bridge_to_rcar_lvds(bridge); =20 if (!lvds->next_bridge) return 0; =20 - return drm_bridge_attach(bridge->encoder, lvds->next_bridge, bridge, + return drm_bridge_attach(encoder, lvds->next_bridge, bridge, flags); } =20 static const struct drm_bridge_funcs rcar_lvds_bridge_ops =3D { .attach =3D rcar_lvds_attach, diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c b/drivers/gpu/= drm/renesas/rcar-du/rcar_mipi_dsi.c index d1e626068065c559a708772d3bbf16efe166ff59..7ab8be46c7f6547f29b4d45af7a= c704283da9dcd 100644 --- a/drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c @@ -797,15 +797,16 @@ static void rcar_mipi_dsi_stop_video(struct rcar_mipi= _dsi *dsi) /* -----------------------------------------------------------------------= ------ * Bridge */ =20 static int rcar_mipi_dsi_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct rcar_mipi_dsi *dsi =3D bridge_to_rcar_mipi_dsi(bridge); =20 - return drm_bridge_attach(bridge->encoder, dsi->next_bridge, bridge, + return drm_bridge_attach(encoder, dsi->next_bridge, bridge, flags); } =20 static void rcar_mipi_dsi_atomic_enable(struct drm_bridge *bridge, struct drm_atomic_state *state) diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c b/drivers/gpu/d= rm/renesas/rz-du/rzg2l_mipi_dsi.c index 4550c6d847962f06886f2b7645bae73646f1ffb6..96c014449547b4042d7568573fd= e876b5b39bd04 100644 --- a/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c +++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c @@ -521,15 +521,16 @@ static int rzg2l_mipi_dsi_stop_video(struct rzg2l_mip= i_dsi *dsi) /* -----------------------------------------------------------------------= ------ * Bridge */ =20 static int rzg2l_mipi_dsi_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct rzg2l_mipi_dsi *dsi =3D bridge_to_rzg2l_mipi_dsi(bridge); =20 - return drm_bridge_attach(bridge->encoder, dsi->next_bridge, bridge, + return drm_bridge_attach(encoder, dsi->next_bridge, bridge, flags); } =20 static void rzg2l_mipi_dsi_atomic_enable(struct drm_bridge *bridge, struct drm_atomic_state *state) diff --git a/drivers/gpu/drm/stm/lvds.c b/drivers/gpu/drm/stm/lvds.c index 4613e8e3b8fddc4455be0e3f81e0e811418746a0..a3ae9a93ce6670eb2c4dd36b3e5= 72fcbca791a1c 100644 --- a/drivers/gpu/drm/stm/lvds.c +++ b/drivers/gpu/drm/stm/lvds.c @@ -932,32 +932,31 @@ static const struct drm_connector_funcs lvds_conn_fun= cs =3D { .destroy =3D drm_connector_cleanup, .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, }; =20 -static int lvds_attach(struct drm_bridge *bridge, +static int lvds_attach(struct drm_bridge *bridge, struct drm_encoder *enco= der, enum drm_bridge_attach_flags flags) { struct stm_lvds *lvds =3D bridge_to_stm_lvds(bridge); struct drm_connector *connector =3D &lvds->connector; - struct drm_encoder *encoder =3D bridge->encoder; int ret; =20 - if (!bridge->encoder) { + if (!encoder) { drm_err(bridge->dev, "Parent encoder object not found\n"); return -ENODEV; } =20 /* Set the encoder type as caller does not know it */ - bridge->encoder->encoder_type =3D DRM_MODE_ENCODER_LVDS; + encoder->encoder_type =3D DRM_MODE_ENCODER_LVDS; =20 /* No cloning support */ - bridge->encoder->possible_clones =3D 0; + encoder->possible_clones =3D 0; =20 /* If we have a next bridge just attach it. */ if (lvds->next_bridge) - return drm_bridge_attach(bridge->encoder, lvds->next_bridge, + return drm_bridge_attach(encoder, lvds->next_bridge, bridge, flags); =20 if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { drm_err(bridge->dev, "Fix bridge driver to make connector optional!"); return -EINVAL; diff --git a/drivers/gpu/drm/tidss/tidss_encoder.c b/drivers/gpu/drm/tidss/= tidss_encoder.c index 17a86bed805481c6cf054f6cb3176d60faa0351c..95b4aeff277505d64254177093d= 9bcc4de9f4a86 100644 --- a/drivers/gpu/drm/tidss/tidss_encoder.c +++ b/drivers/gpu/drm/tidss/tidss_encoder.c @@ -32,15 +32,16 @@ static inline struct tidss_encoder { return container_of(b, struct tidss_encoder, bridge); } =20 static int tidss_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct tidss_encoder *t_enc =3D bridge_to_tidss_encoder(bridge); =20 - return drm_bridge_attach(bridge->encoder, t_enc->next_bridge, + return drm_bridge_attach(encoder, t_enc->next_bridge, bridge, flags); } =20 static int tidss_bridge_atomic_check(struct drm_bridge *bridge, struct drm_bridge_state *bridge_state, diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c index 779b22efe27bffc586a760fdc49012e02ac23d0d..efc6f6078b026764c59cfb2a33b= 28a88b7018c3a 100644 --- a/drivers/gpu/drm/vc4/vc4_dsi.c +++ b/drivers/gpu/drm/vc4/vc4_dsi.c @@ -1158,16 +1158,17 @@ static void vc4_dsi_bridge_enable(struct drm_bridge= *bridge, drm_print_regset32(&p, &dsi->regset); } } =20 static int vc4_dsi_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct vc4_dsi *dsi =3D bridge_to_vc4_dsi(bridge); =20 /* Attach the panel or bridge to the dsi bridge */ - return drm_bridge_attach(bridge->encoder, dsi->out_bridge, + return drm_bridge_attach(encoder, dsi->out_bridge, &dsi->bridge, flags); } =20 static ssize_t vc4_dsi_host_transfer(struct mipi_dsi_host *host, const struct mipi_dsi_msg *msg) diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.c b/drivers/gpu/drm/xlnx/zynqmp= _dp.c index a6a4a871f197652f589e569b9b8c95f79fa5a2a1..11d2415fb5a1f7fad0342189833= 1289f2295d68b 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_dp.c +++ b/drivers/gpu/drm/xlnx/zynqmp_dp.c @@ -1479,10 +1479,11 @@ static void zynqmp_dp_disp_disable(struct zynqmp_dp= *dp, /* -----------------------------------------------------------------------= ------ * DRM Bridge */ =20 static int zynqmp_dp_bridge_attach(struct drm_bridge *bridge, + struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct zynqmp_dp *dp =3D bridge_to_dp(bridge); int ret; =20 @@ -1492,11 +1493,11 @@ static int zynqmp_dp_bridge_attach(struct drm_bridg= e *bridge, dev_err(dp->dev, "failed to initialize DP aux\n"); return ret; } =20 if (dp->next_bridge) { - ret =3D drm_bridge_attach(bridge->encoder, dp->next_bridge, + ret =3D drm_bridge_attach(encoder, dp->next_bridge, bridge, flags); if (ret < 0) goto error; } =20 diff --git a/drivers/platform/arm64/acer-aspire1-ec.c b/drivers/platform/ar= m64/acer-aspire1-ec.c index 2df42406430db7bd9ae5dcca6aace88c3bf3baa0..958fe1bf5f85bb69ac7962f217d= e9f0b40cde9a1 100644 --- a/drivers/platform/arm64/acer-aspire1-ec.c +++ b/drivers/platform/arm64/acer-aspire1-ec.c @@ -364,11 +364,12 @@ static const struct power_supply_desc aspire_ec_adp_p= sy_desc =3D { =20 /* * USB-C DP Alt mode HPD. */ =20 -static int aspire_ec_bridge_attach(struct drm_bridge *bridge, enum drm_bri= dge_attach_flags flags) +static int aspire_ec_bridge_attach(struct drm_bridge *bridge, struct drm_e= ncoder *encoder, + enum drm_bridge_attach_flags flags) { return flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR ? 0 : -EINVAL; } =20 static void aspire_ec_bridge_update_hpd_work(struct work_struct *work) diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index b0d86a685a41e3172e0aa15d1c9a5ae8e959255a..884ff1faa4c896c28a38399ceaa= 5016ab704c886 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -71,11 +71,11 @@ struct drm_bridge_funcs { * * RETURNS: * * Zero on success, error code on failure. */ - int (*attach)(struct drm_bridge *bridge, + int (*attach)(struct drm_bridge *bridge, struct drm_encoder *encoder, enum drm_bridge_attach_flags flags); =20 /** * @detach: * --=20 2.48.1 From nobody Sun Dec 14 13:53:06 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 85CAD26136B for ; Thu, 13 Mar 2025 12:00:18 +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=1741867218; cv=none; b=pmUs0YdDut6xsTUZefSFRmFSHqFk0kcHEqU3zTcyvz/ywwIRLo0QGVjtoWFHPOLH262rCApNPB9HgrXrhEq+2MNuiHmwo6G3JI05hJcIPWTJdv2BL6ofefg7h7a/T7aGMH08mQiZp0pGYPm8gyM3Goafk0oDty17+ecD+bjrlXU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867218; c=relaxed/simple; bh=gwr3V49Utd/SKmLHHtevd1iF7qftbaASGq6Mah8+cNI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lpnUEXpNYSikrJkScAu+5ycmQKTVtGsYjtusSGp5SxFlFk9toScUqGnXhVmWcy6+kRS1oa3BJBXTusgi9MPQVCmhN8Ow6czVlDIEvdjiB3aX3w2ey5Gof/Vukedje17SyjZ2rBY1SAHk1zar1sjZWC+aeHLKcCGLmi/CK7afkVg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ob/nNi+z; 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="Ob/nNi+z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE6EDC4CEEB; Thu, 13 Mar 2025 12:00:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741867218; bh=gwr3V49Utd/SKmLHHtevd1iF7qftbaASGq6Mah8+cNI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Ob/nNi+zhKrLnG39o9effLm7IfK+Aoot/yxke/ynTbBGsZxn5zt6H0gD0JZS5Kv3T yfqzNsGU3KQDINGgZWTbOLfwjXDvNOctQDOp0w7wmM3JQ7AlIR2Uc8GzZGw9Jjes4W GRg70tVrgkbGjnzqmB6OS+R6Se0frXcZoZvqYmtpIhMPfZ9Axl209f4foNfHKFV9Wz 4RUiP1s9DpRaEjYd++2eEKBg97GExRBHNCHFkN/ZYhZ1CQHPfaFqZgiINuUksDDIdM BsE1ALXJENdq/y8OMk7hqs7b0BAjfTPLCywEjmFznligPj18ZHKqUXJlFds73ylfuR xLibtri2i10FQ== From: Maxime Ripard Date: Thu, 13 Mar 2025 12:59:56 +0100 Subject: [PATCH v6 02/16] drm/bridge: Provide a helper to retrieve current bridge state 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: <20250313-bridge-connector-v6-2-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=1723; i=mripard@kernel.org; h=from:subject:message-id; bh=gwr3V49Utd/SKmLHHtevd1iF7qftbaASGq6Mah8+cNI=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOmXTuxjtdt9zSEprtvQ3JzvzwUr4YwtbXJOzqtVehfoW rd13+LrKGVhEONikBVTZIkRNl8Sd2rW6042vnkwc1iZQIYwcHEKwERklzIyLA2adUjp2bKvS4JE Jk2eu59/t3iv/+d9DB9eLjRVOaCrJMbI8MV4YiXb9ft3zb4+2sTvy7TgsW5Ok0xOfqpU79LbM+Y wMQEA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D The current bridge state is accessible from the drm_bridge structure, but since it's fairly indirect it's not easy to figure out. Provide a helper to retrieve it. Reviewed-by: Dmitry Baryshkov Signed-off-by: Maxime Ripard --- include/drm/drm_bridge.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 884ff1faa4c896c28a38399ceaa5016ab704c886..cdad3b78a195aa39776c93e2371= 217d3d3fb6064 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -955,10 +955,42 @@ static inline struct drm_bridge *of_drm_find_bridge(s= truct device_node *np) { return NULL; } #endif =20 +/** + * drm_bridge_get_current_state() - Get the current bridge state + * @bridge: bridge object + * + * This function must be called with the modeset lock held. + * + * RETURNS: + * + * The current bridge state, or NULL if there is none. + */ +static inline struct drm_bridge_state * +drm_bridge_get_current_state(struct drm_bridge *bridge) +{ + if (!bridge) + return NULL; + + /* + * Only atomic bridges will have bridge->base initialized by + * drm_atomic_private_obj_init(), so we need to make sure we're + * working with one before we try to use the lock. + */ + if (!bridge->funcs || !bridge->funcs->atomic_reset) + return NULL; + + drm_modeset_lock_assert_held(&bridge->base.lock); + + if (!bridge->base.state) + return NULL; + + return drm_priv_to_bridge_state(bridge->base.state); +} + /** * drm_bridge_get_next_bridge() - Get the next bridge in the chain * @bridge: bridge object * * RETURNS: --=20 2.48.1 From nobody Sun Dec 14 13:53:06 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 178B726739A for ; Thu, 13 Mar 2025 12:00:21 +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=1741867222; cv=none; b=Muh0I/TtPs12hps8WRQ06OCzPC158IzRihtO2AZB5JBZGa94Bk3O0DObN+gVimONv/jaIX2QXWZbUwlt4e+SxGsy6BWpoXAkfntDLgY+HkdX8OVFE18PYmcoWUIEqY7CjcMdJW0e9l3zlY2N2wM1kH0XGQHIAPzbn4hiul5Wc04= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867222; c=relaxed/simple; bh=0hHbjox8UHRiKYoDTXGFrh7PgRlPnPde9Kma2JZkQzo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CMIdw8H3UHaMSm3lsV9ozp06G88XQUVk0eSGZT06mEWS4jYFkGahywoB8zdNaRDEy4vQ1YC4UqL6fOJYiP27n3IG5tb3IcE018dmVZ6vEazaALZnY0CUvoNE+ULily6ceJYX0gaSHcWhbuwONUDwoz5NmW7scfJoxlPSFPX2Z+4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PsHeQA5j; 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="PsHeQA5j" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 388A6C4CEEA; Thu, 13 Mar 2025 12:00:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741867221; bh=0hHbjox8UHRiKYoDTXGFrh7PgRlPnPde9Kma2JZkQzo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=PsHeQA5jlWWina4qgwZvMUoTjXVH/ki9SVJMcN2Q/wRkYgcR7MeITswgFhsNoalgq PYRpy0UWSRsL6ZVdi+6FzxaDKJShjoe8MzTAweg/WeEJE/DKA1lat/zf59tL+vLycm GPVPKAMH/zlPEeacKNhBeyjt5fbKDACc57HWJx4P1JiysQEGKHczT5EihMd8AOKQzx VCT1tV5xOIOTkMyUswpw2PQFN8PWH1IP6+2ZhICaP1dsA5SwZlnxeCFQLdtkyfjdgy /7vgOvQmGjGD/FcB8AwK4g3dUHULB3zMxoD+tkp5cNEKhRA7nyVas42IpgMUm4Z3tk 1X66ahgM1nZ1g== From: Maxime Ripard Date: Thu, 13 Mar 2025 12:59:57 +0100 Subject: [PATCH v6 03/16] drm/tests: Add kunit tests for bridges 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: <20250313-bridge-connector-v6-3-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=7953; i=mripard@kernel.org; h=from:subject:message-id; bh=0hHbjox8UHRiKYoDTXGFrh7PgRlPnPde9Kma2JZkQzo=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOmXTuz3MTl/Pv7dNE3ubzv+Tf53IHXqZPsqZh+Gt29tb O7OlP/9tKOUhUGMi0FWTJElRth8SdypWa872fjmwcxhZQIZwsDFKQATmZXH8E+p5eAV3gW5T9OO Gl68nfbr/O5dFZt956jHbPNNcKy9JfKV4Rezz4L0W5XMBwRPyovXXRC28Xx77ujG8J8NNYcnMFw 80c0HAA== X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D None of the drm_bridge function have kunit tests so far. Let's change that, starting with drm_bridge_get_current_state(). Reviewed-by: Dmitry Baryshkov Signed-off-by: Maxime Ripard --- drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/tests/Makefile | 1 + drivers/gpu/drm/tests/drm_bridge_test.c | 210 ++++++++++++++++++++++++++++= ++++ 3 files changed, 212 insertions(+) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index e5b59de28216385f3783373e636d193d38d02646..9b406123132912f0578e9c8288d= 4c80e65f75f67 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -72,10 +72,11 @@ config DRM_KUNIT_TEST_HELPERS KUnit Helpers for KMS drivers. =20 config DRM_KUNIT_TEST tristate "KUnit tests for DRM" if !KUNIT_ALL_TESTS depends on DRM && KUNIT && MMU + select DRM_BRIDGE_CONNECTOR select DRM_BUDDY select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_HDMI_STATE_HELPER select DRM_DISPLAY_HELPER select DRM_EXEC diff --git a/drivers/gpu/drm/tests/Makefile b/drivers/gpu/drm/tests/Makefile index 0109bcf7faa54993cce337f522eae78f0fa6ffcb..6691c577d2d4581a4185bac2ce8= 9a6b14b339b35 100644 --- a/drivers/gpu/drm/tests/Makefile +++ b/drivers/gpu/drm/tests/Makefile @@ -3,10 +3,11 @@ obj-$(CONFIG_DRM_KUNIT_TEST_HELPERS) +=3D \ drm_kunit_helpers.o =20 obj-$(CONFIG_DRM_KUNIT_TEST) +=3D \ drm_atomic_state_test.o \ + drm_bridge_test.o \ drm_buddy_test.o \ drm_cmdline_parser_test.o \ drm_connector_test.o \ drm_damage_helper_test.o \ drm_dp_mst_helper_test.o \ diff --git a/drivers/gpu/drm/tests/drm_bridge_test.c b/drivers/gpu/drm/test= s/drm_bridge_test.c new file mode 100644 index 0000000000000000000000000000000000000000..c0a05c459d957c3f9d281957f00= 2f6bd36cce367 --- /dev/null +++ b/drivers/gpu/drm/tests/drm_bridge_test.c @@ -0,0 +1,210 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Kunit test for drm_bridge functions + */ +#include +#include +#include +#include + +#include + +struct drm_bridge_init_priv { + struct drm_device drm; + struct drm_plane *plane; + struct drm_crtc *crtc; + struct drm_encoder encoder; + struct drm_bridge bridge; + struct drm_connector *connector; +}; + +static const struct drm_bridge_funcs drm_test_bridge_legacy_funcs =3D { +}; + +static const struct drm_bridge_funcs drm_test_bridge_atomic_funcs =3D { + .atomic_destroy_state =3D drm_atomic_helper_bridge_destroy_state, + .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, + .atomic_reset =3D drm_atomic_helper_bridge_reset, +}; + +KUNIT_DEFINE_ACTION_WRAPPER(drm_bridge_remove_wrapper, + drm_bridge_remove, + struct drm_bridge *); + +static int drm_kunit_bridge_add(struct kunit *test, + struct drm_bridge *bridge) +{ + drm_bridge_add(bridge); + + return kunit_add_action_or_reset(test, + drm_bridge_remove_wrapper, + bridge); +} + +static struct drm_bridge_init_priv * +drm_test_bridge_init(struct kunit *test, const struct drm_bridge_funcs *fu= ncs) +{ + struct drm_bridge_init_priv *priv; + struct drm_encoder *enc; + struct drm_bridge *bridge; + struct drm_device *drm; + struct device *dev; + int ret; + + dev =3D drm_kunit_helper_alloc_device(test); + if (IS_ERR(dev)) + return ERR_CAST(dev); + + priv =3D drm_kunit_helper_alloc_drm_device(test, dev, + struct drm_bridge_init_priv, drm, + DRIVER_MODESET | DRIVER_ATOMIC); + if (IS_ERR(priv)) + return ERR_CAST(priv); + + drm =3D &priv->drm; + priv->plane =3D drm_kunit_helper_create_primary_plane(test, drm, + NULL, + NULL, + NULL, 0, + NULL); + if (IS_ERR(priv->plane)) + return ERR_CAST(priv->plane); + + priv->crtc =3D drm_kunit_helper_create_crtc(test, drm, + priv->plane, NULL, + NULL, + NULL); + if (IS_ERR(priv->crtc)) + return ERR_CAST(priv->crtc); + + enc =3D &priv->encoder; + ret =3D drmm_encoder_init(drm, enc, NULL, DRM_MODE_ENCODER_TMDS, NULL); + if (ret) + return ERR_PTR(ret); + + enc->possible_crtcs =3D drm_crtc_mask(priv->crtc); + + bridge =3D &priv->bridge; + bridge->type =3D DRM_MODE_CONNECTOR_VIRTUAL; + bridge->funcs =3D funcs; + + ret =3D drm_kunit_bridge_add(test, bridge); + if (ret) + return ERR_PTR(ret); + + ret =3D drm_bridge_attach(enc, bridge, NULL, 0); + if (ret) + return ERR_PTR(ret); + + priv->connector =3D drm_bridge_connector_init(drm, enc); + if (IS_ERR(priv->connector)) + return ERR_CAST(priv->connector); + + drm_connector_attach_encoder(priv->connector, enc); + + drm_mode_config_reset(drm); + + return priv; +} + +/* + * Test that drm_bridge_get_current_state() returns the last committed + * state for an atomic bridge. + */ +static void drm_test_drm_bridge_get_current_state_atomic(struct kunit *tes= t) +{ + struct drm_modeset_acquire_ctx ctx; + struct drm_bridge_init_priv *priv; + struct drm_bridge_state *curr_bridge_state; + struct drm_bridge_state *bridge_state; + struct drm_atomic_state *state; + struct drm_bridge *bridge; + struct drm_device *drm; + int ret; + + priv =3D drm_test_bridge_init(test, &drm_test_bridge_atomic_funcs); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); + + drm_modeset_acquire_init(&ctx, 0); + + drm =3D &priv->drm; + state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); + +retry_commit: + bridge =3D &priv->bridge; + bridge_state =3D drm_atomic_get_bridge_state(state, bridge); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, bridge_state); + + ret =3D drm_atomic_commit(state); + if (ret =3D=3D -EDEADLK) { + drm_atomic_state_clear(state); + drm_modeset_backoff(&ctx); + goto retry_commit; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); + + drm_modeset_acquire_init(&ctx, 0); + +retry_state: + ret =3D drm_modeset_lock(&bridge->base.lock, &ctx); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_state; + } + + curr_bridge_state =3D drm_bridge_get_current_state(bridge); + KUNIT_EXPECT_PTR_EQ(test, curr_bridge_state, bridge_state); + + drm_modeset_unlock(&bridge->base.lock); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); +} + +/* + * Test that drm_bridge_get_current_state() returns NULL for a + * non-atomic bridge. + */ +static void drm_test_drm_bridge_get_current_state_legacy(struct kunit *tes= t) +{ + struct drm_bridge_init_priv *priv; + struct drm_bridge *bridge; + + priv =3D drm_test_bridge_init(test, &drm_test_bridge_legacy_funcs); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); + + /* + * NOTE: Strictly speaking, we should take the bridge->base.lock + * before calling that function. However, bridge->base is only + * initialized if the bridge is atomic, while we explicitly + * initialize one that isn't there. + * + * In order to avoid unnecessary warnings, let's skip the + * locking. The function would return NULL in all cases anyway, + * so we don't really have any concurrency to worry about. + */ + bridge =3D &priv->bridge; + KUNIT_EXPECT_NULL(test, drm_bridge_get_current_state(bridge)); +} + +static struct kunit_case drm_bridge_get_current_state_tests[] =3D { + KUNIT_CASE(drm_test_drm_bridge_get_current_state_atomic), + KUNIT_CASE(drm_test_drm_bridge_get_current_state_legacy), + { } +}; + + +static struct kunit_suite drm_bridge_get_current_state_test_suite =3D { + .name =3D "drm_test_bridge_get_current_state", + .test_cases =3D drm_bridge_get_current_state_tests, +}; + +kunit_test_suite(drm_bridge_get_current_state_test_suite); + +MODULE_AUTHOR("Maxime Ripard "); +MODULE_DESCRIPTION("Kunit test for drm_bridge functions"); +MODULE_LICENSE("GPL"); --=20 2.48.1 From nobody Sun Dec 14 13:53:06 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 359AA2673BD for ; Thu, 13 Mar 2025 12:00:24 +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=1741867225; cv=none; b=aelPhqOsgXhNuC4E9GS9Mnxf53Rsy7hGxWu7oJbXNDNTIb9kT401+xOQA/XpjW/X82s+NAG/+zDeZiDQ/wE9cfOyPBfLUWQaTXZrZcirbfPIhF/SXxojzMrFKyeRaeSqYOXsCwBvv3ORejWXmyLnUYSqvd2C0XoXTuliSsbGyYI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867225; c=relaxed/simple; bh=PAnLIJYxHDydmOwTw9IuYZwIeZMi56vmbg2ujThGttc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sL5cyzfZF6a8nmJYDjrY58Nm9iV/ORZAElxwgSsDTzvI2XU2KFEoClzatLDMBHPGhO1Axxy+Pk32iHBaOcRcvyRJaXBXYjs5G9L+6iSGkAxdf9Gm8qI9W26nMg06zH+KT/AlLXnImpA802G6ghwzCOE7AFwqwLK0JYTfACt6aPA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=k2s5Buzd; 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="k2s5Buzd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C00BC4CEEB; Thu, 13 Mar 2025 12:00:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741867224; bh=PAnLIJYxHDydmOwTw9IuYZwIeZMi56vmbg2ujThGttc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=k2s5Buzdq7CDd2ia63i0yKS4oz+MwVUYe/mLRQRsM3zLPu7kSCE3ruLo31ipA8jYB geAx6tB2WFEQxbWyn0SkOzBwQ1FZhOAzn2HoN8+1KiVZE+VOK8WsG9ZA2DC+qxjWFF kydr8zY3QltEcro6isCRy+x2VS0KXmBV9UrBAlK/mXIfYW9gpctdY6NzdSvbn9Qsr2 8uKuYV19euFPJBQucxiAtqu2bRhk4z3exkf3Xgssv/B5RWr/tgbLdOkJcYRPFEkIbz XkPxloGNDil8OFfezqyGapPXIoPbe31wb14kiqzO52VNbKXX/u5/47b8AWIB0zOg4O g7JPciKQpMaug== From: Maxime Ripard Date: Thu, 13 Mar 2025 12:59:58 +0100 Subject: [PATCH v6 04/16] drm/atomic: Introduce helper to lookup connector by encoder 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: <20250313-bridge-connector-v6-4-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 , Simona Vetter , Simona Vetter X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5933; i=mripard@kernel.org; h=from:subject:message-id; bh=PAnLIJYxHDydmOwTw9IuYZwIeZMi56vmbg2ujThGttc=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOmXThx4dudN9sn2vQemrvm7/3rql/V7xL//aK2+qxXnI rsqK/u4VEcpC4MYF4OsmCJLjLD5krhTs153svHNg5nDygQyhIGLUwAm0nOG4a905oY/21LTlF6s 2CI8m3W+Ws6eKe9exO3MPnCd7eOjPH4Whj8cso2rfXseh7TUuveIrTomJeuzXz6ii7lJpbb6y4d 9bowA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D With the bridges switching over to drm_bridge_connector, the direct association between a bridge driver and its connector was lost. This is mitigated for atomic bridge drivers by the fact you can access the encoder, and then call drm_atomic_get_old_connector_for_encoder() or drm_atomic_get_new_connector_for_encoder() with drm_atomic_state. This was also made easier by providing drm_atomic_state directly to all atomic hooks bridges can implement. However, bridge drivers don't have a way to access drm_atomic_state outside of the modeset path, like from the hotplug interrupt path or any interrupt handler. Let's introduce a function to retrieve the connector currently assigned to an encoder, without using drm_atomic_state, to make these drivers' life easier. Reviewed-by: Dmitry Baryshkov Reviewed-by: Simona Vetter Tested-by: Herve Codina Co-developed-by: Simona Vetter Signed-off-by: Simona Vetter Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_atomic.c | 59 ++++++++++++++++++++++++++++++++++++++++= ++++ include/drm/drm_atomic.h | 3 +++ 2 files changed, 62 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 9ea2611770f43ce7ccba410406d5f2c528aab022..0138cf0b8b630dcf86bac7113db= 0401fa6b45633 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -931,10 +931,13 @@ EXPORT_SYMBOL(drm_atomic_get_new_private_obj_state); * case, it is sometimes useful to differentiate commits which had no prior * connectors attached to @encoder vs ones that did (and to inspect their * state). This is especially true in enable hooks because the pipeline has * changed. * + * If you don't have access to the atomic state, see + * drm_atomic_get_connector_for_encoder(). + * * Returns: The old connector connected to @encoder, or NULL if the encode= r is * not connected. */ struct drm_connector * drm_atomic_get_old_connector_for_encoder(const struct drm_atomic_state *st= ate, @@ -965,10 +968,13 @@ EXPORT_SYMBOL(drm_atomic_get_old_connector_for_encode= r); * this function will return NULL. While this may seem like an invalid use= case, * it is sometimes useful to differentiate commits which have no connectors * attached to @encoder vs ones that do (and to inspect their state). This= is * especially true in disable hooks because the pipeline will change. * + * If you don't have access to the atomic state, see + * drm_atomic_get_connector_for_encoder(). + * * Returns: The new connector connected to @encoder, or NULL if the encode= r is * not connected. */ struct drm_connector * drm_atomic_get_new_connector_for_encoder(const struct drm_atomic_state *st= ate, @@ -985,10 +991,63 @@ drm_atomic_get_new_connector_for_encoder(const struct= drm_atomic_state *state, =20 return NULL; } EXPORT_SYMBOL(drm_atomic_get_new_connector_for_encoder); =20 +/** + * drm_atomic_get_connector_for_encoder - Get connector currently assigned= to an encoder + * @encoder: The encoder to find the connector of + * @ctx: Modeset locking context + * + * This function finds and returns the connector currently assigned to + * an @encoder. + * + * It is similar to the drm_atomic_get_old_connector_for_encoder() and + * drm_atomic_get_new_connector_for_encoder() helpers, but doesn't + * require access to the atomic state. If you have access to it, prefer + * using these. This helper is typically useful in situations where you + * don't have access to the atomic state, like detect, link repair, + * threaded interrupt handlers, or hooks from other frameworks (ALSA, + * CEC, etc.). + * + * Returns: + * The connector connected to @encoder, or an error pointer otherwise. + * When the error is EDEADLK, a deadlock has been detected and the + * sequence must be restarted. + */ +struct drm_connector * +drm_atomic_get_connector_for_encoder(const struct drm_encoder *encoder, + struct drm_modeset_acquire_ctx *ctx) +{ + struct drm_connector_list_iter conn_iter; + struct drm_connector *out_connector =3D ERR_PTR(-EINVAL); + struct drm_connector *connector; + struct drm_device *dev =3D encoder->dev; + int ret; + + ret =3D drm_modeset_lock(&dev->mode_config.connection_mutex, ctx); + if (ret) + return ERR_PTR(ret); + + drm_connector_list_iter_begin(dev, &conn_iter); + drm_for_each_connector_iter(connector, &conn_iter) { + if (!connector->state) + continue; + + if (encoder =3D=3D connector->state->best_encoder) { + out_connector =3D connector; + break; + } + } + drm_connector_list_iter_end(&conn_iter); + drm_modeset_unlock(&dev->mode_config.connection_mutex); + + return out_connector; +} +EXPORT_SYMBOL(drm_atomic_get_connector_for_encoder); + + /** * drm_atomic_get_old_crtc_for_encoder - Get old crtc for an encoder * @state: Atomic state * @encoder: The encoder to fetch the crtc state for * diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index 4c673f0698fef6b60f77db980378d5e88e0e250e..38636a593c9d98cadda85ccd673= 26cb152f0dd27 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -623,10 +623,13 @@ struct drm_connector * drm_atomic_get_old_connector_for_encoder(const struct drm_atomic_state *st= ate, struct drm_encoder *encoder); struct drm_connector * drm_atomic_get_new_connector_for_encoder(const struct drm_atomic_state *st= ate, struct drm_encoder *encoder); +struct drm_connector * +drm_atomic_get_connector_for_encoder(const struct drm_encoder *encoder, + struct drm_modeset_acquire_ctx *ctx); =20 struct drm_crtc * drm_atomic_get_old_crtc_for_encoder(struct drm_atomic_state *state, struct drm_encoder *encoder); struct drm_crtc * --=20 2.48.1 From nobody Sun Dec 14 13:53:06 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 D0E8A2676E0 for ; Thu, 13 Mar 2025 12:00:27 +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=1741867227; cv=none; b=AIIErkkHshR6N8WdPWOnf7//xTbNK0Afacp11om3YQtv/Ry7MY4WACFwpUAr6qWruqmVPg1blc/tcopQBGBJp+oqoC+jNcizXAOnzJNoEMBLrPhtk+OB7jxOJwpuWIGZk6c/qivgm7D9siPDD8vBIr3jfL2b6wuSOwiY9fet9AU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867227; c=relaxed/simple; bh=W1KZgJPSyJ/7ZZeebiPiFkuJP4qW6MCWO9Xt7TxeeEE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VWpBIuFcl2dSW0aC5z9AmeRixZz0S17mCGZxewt9P9BGBz0sus0FSQEzTycwNzal/vh+q1jBNsnb2YLKzMCkr/hETISKs2GyO2ZYOfRfs5Z+IDAT5kYWLnar8SrxHpg5MlJLYTrTxFvr++m8ky0AaeAHQcm5FBlbvXN3J1imDkM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LPlfVPX3; 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="LPlfVPX3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01D2CC4CEDD; Thu, 13 Mar 2025 12:00:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741867227; bh=W1KZgJPSyJ/7ZZeebiPiFkuJP4qW6MCWO9Xt7TxeeEE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=LPlfVPX3gG65jow2lxcGL+w/QiHfr4IY1IXnm5O15ffsR3kUvzPfOiJ/M8fz7WxDS 0zFAqW8hmv7U7JpbtWc6QeEp7o8L1eQCTvnSAaptOaoFnJySh3vvf+mvRh99swg71m +AUrx2/jur8eyFrexG1cIYAEBwSBDxPTVGO/Kgrm3dxYC+HOFmebn/ssJ6hxoVbVZR 8HdfyUIFdYh9HUN3/Mj48jmHeF0WsWObFD3mRexbmm6QFMwMYOx6aX748p4t5e909I ZqI1Ytbc6SI4Qx9ktFJt1XcmLc6ZW19pIb4T7pJ/lz7Zxur96YF4AJp7NglGxA7uzr cE2WJkKKYPuBA== From: Maxime Ripard Date: Thu, 13 Mar 2025 12:59:59 +0100 Subject: [PATCH v6 05/16] drm/tests: helpers: Create new helper to enable output 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: <20250313-bridge-connector-v6-5-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=4286; i=mripard@kernel.org; h=from:subject:message-id; bh=W1KZgJPSyJ/7ZZeebiPiFkuJP4qW6MCWO9Xt7TxeeEE=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOmXThzYc5vFjYH1/c6/nFoPV1nKbsu+ucJ/wvHCQ21bV Ap8XpjwdpSyMIhxMciKKbLECJsviTs163UnG988mDmsTCBDGLg4BWAih88wMlwx/JTmbqBUcPbX mvhvH74am2zYMlUmYUZO+x6h88Ff/O8xMmxVEl6gcVK6weffi20ls6T7tBKmMLsyhVWbxfL3Nl1 9wwMA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D We'll need the HDMI state tests light_up_connector() function in more tests, so let's promote it to a helper. Reviewed-by: Dmitry Baryshkov Signed-off-by: Maxime Ripard --- drivers/gpu/drm/tests/drm_kunit_helpers.c | 61 +++++++++++++++++++++++++++= ++++ include/drm/drm_kunit_helpers.h | 8 ++++ 2 files changed, 69 insertions(+) diff --git a/drivers/gpu/drm/tests/drm_kunit_helpers.c b/drivers/gpu/drm/te= sts/drm_kunit_helpers.c index a4eb68f0decca15988105b9d58266e3871934a8b..14ad8f0a0af18410a7129ec3463= 5678a8120d3cb 100644 --- a/drivers/gpu/drm/tests/drm_kunit_helpers.c +++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c @@ -1,9 +1,10 @@ // SPDX-License-Identifier: GPL-2.0 =20 #include #include +#include #include #include #include #include #include @@ -269,10 +270,70 @@ drm_kunit_helper_create_crtc(struct kunit *test, =20 return crtc; } EXPORT_SYMBOL_GPL(drm_kunit_helper_create_crtc); =20 +/** + * drm_kunit_helper_enable_crtc_connector - Enables a CRTC -> Connector ou= tput + * @test: The test context object + * @drm: The device to alloc the plane for + * @crtc: The CRTC to enable + * @connector: The Connector to enable + * @mode: The display mode to configure the CRTC with + * @ctx: Locking context + * + * This function creates an atomic update to enable the route from @crtc + * to @connector, with the given @mode. + * + * Returns: + * + * A pointer to the new CRTC, or an ERR_PTR() otherwise. If the error + * returned is EDEADLK, the entire atomic sequence must be restarted. + */ +int drm_kunit_helper_enable_crtc_connector(struct kunit *test, + struct drm_device *drm, + struct drm_crtc *crtc, + struct drm_connector *connector, + const struct drm_display_mode *mode, + struct drm_modeset_acquire_ctx *ctx) +{ + struct drm_atomic_state *state; + struct drm_connector_state *conn_state; + struct drm_crtc_state *crtc_state; + int ret; + + state =3D drm_kunit_helper_atomic_state_alloc(test, drm, ctx); + if (IS_ERR(state)) + return PTR_ERR(state); + + conn_state =3D drm_atomic_get_connector_state(state, connector); + if (IS_ERR(conn_state)) + return PTR_ERR(conn_state); + + ret =3D drm_atomic_set_crtc_for_connector(conn_state, crtc); + if (ret) + return ret; + + crtc_state =3D drm_atomic_get_crtc_state(state, crtc); + if (IS_ERR(crtc_state)) + return PTR_ERR(crtc_state); + + ret =3D drm_atomic_set_mode_for_crtc(crtc_state, mode); + if (ret) + return ret; + + crtc_state->enable =3D true; + crtc_state->active =3D true; + + ret =3D drm_atomic_commit(state); + if (ret) + return ret; + + return 0; +} +EXPORT_SYMBOL_GPL(drm_kunit_helper_enable_crtc_connector); + static void kunit_action_drm_mode_destroy(void *ptr) { struct drm_display_mode *mode =3D ptr; =20 drm_mode_destroy(NULL, mode); diff --git a/include/drm/drm_kunit_helpers.h b/include/drm/drm_kunit_helper= s.h index 11d59ce0bac0bbec07ae5f07ed9710cf01d73f09..1cda7281f30029e649c62fc0fd9= d9ae6889d43ac 100644 --- a/include/drm/drm_kunit_helpers.h +++ b/include/drm/drm_kunit_helpers.h @@ -7,10 +7,11 @@ =20 #include =20 #include =20 +struct drm_connector; struct drm_crtc_funcs; struct drm_crtc_helper_funcs; struct drm_device; struct drm_plane_funcs; struct drm_plane_helper_funcs; @@ -116,10 +117,17 @@ drm_kunit_helper_create_crtc(struct kunit *test, struct drm_plane *primary, struct drm_plane *cursor, const struct drm_crtc_funcs *funcs, const struct drm_crtc_helper_funcs *helper_funcs); =20 +int drm_kunit_helper_enable_crtc_connector(struct kunit *test, + struct drm_device *drm, + struct drm_crtc *crtc, + struct drm_connector *connector, + const struct drm_display_mode *mode, + struct drm_modeset_acquire_ctx *ctx); + struct drm_display_mode * drm_kunit_display_mode_from_cea_vic(struct kunit *test, struct drm_device = *dev, u8 video_code); =20 #endif // DRM_KUNIT_HELPERS_H_ --=20 2.48.1 From nobody Sun Dec 14 13:53:06 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 9580A2676FF for ; Thu, 13 Mar 2025 12:00:30 +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=1741867230; cv=none; b=QoWI1dYne+3DKK5fGNT8aLO8F/fRM9A5qWo//mfBFYO+k6Sq8L36SA3javqzFPZtYoyI461V+DPATSKiXJP4xw7MUdRZqSEwb4Wkn+MyfOR4HoutHXfQyrZ2qwqZtp6SR6Tc+CD1aILbxR6UFZJn+xGuvJU0cZToL6l+IqpN+9Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867230; c=relaxed/simple; bh=+LGiRKEcCcITA0C2Yd4YksjVY0vEpo6IKjVYAWJOpdQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Dv43egAySWANq0zkXZERrsxB8v7nBfrNDt6GO1WVF/mEUod3QabWgXohjNM19iDkVNba76uN0uxeELI+hjcxBtHGFAfpjXSFehK6iQmz1sKO6GIdsCF97OHHBCOsMvYj1rvOGtueRFK2XMKjR7S5ZEDuiomULtXjJMQVELn186E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ioLIx3Ck; 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="ioLIx3Ck" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7614C4CEF2; Thu, 13 Mar 2025 12:00:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741867230; bh=+LGiRKEcCcITA0C2Yd4YksjVY0vEpo6IKjVYAWJOpdQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ioLIx3CkVx8iRV/7QMSe8WFZCEZOOgrMDqk3ZCg2P7T5+tp8P4f1wru7X20SGeV69 LibhXFfWuR7ERBGsdpmsv/413JuruuZm7ByUu7gY2xEPUjBWdlm3S3N4HwpKS73B7y zwEcyaRBQ1oDGn5EbaEhtP54ZUf+cbrUke6zf7X6IogUnSGd0xbcvsNkaOV6BvlWIV pAEZRgjyqdO1C7pp60xWUBQWO27MtQ0KUrB0gRRS8hGcPTircL6mOPn9YXVT/1QDZ4 W5fw2snlZqNyojKblCNlZsRuVAsfHKrTYBtXTx/7jpieaCZVlAFjMj7yl9hpHCQsW0 tMNB8sNrow2lw== From: Maxime Ripard Date: Thu, 13 Mar 2025 13:00:00 +0100 Subject: [PATCH v6 06/16] drm/tests: hdmi_state_helpers: Switch to new helper 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: <20250313-bridge-connector-v6-6-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=15615; i=mripard@kernel.org; h=from:subject:message-id; bh=+LGiRKEcCcITA0C2Yd4YksjVY0vEpo6IKjVYAWJOpdQ=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOmXThy8HaR2OO1Z+s2nf8/F7bvM/NwvQaR6df3DzXNF8 1YfeenzsaOUhUGMi0FWTJElRth8SdypWa872fjmwcxhZQIZwsDFKQATYT/E8It5/+OYNcbX3865 z/YwbMdT69NHOMOj533e8MBx/7Q5h6SqGP4KmgT6z6o+Lncg5F/bGxFBBauNxue5so9/Pjsh1KL L8wUTAA== X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D We introduced a new helper that supersedes the light_up_connector() function in drm_hdmi_state_helper_test, so let's convert all our tests to it. Reviewed-by: Dmitry Baryshkov Signed-off-by: Maxime Ripard --- drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 158 ++++++++++++-----= ---- 1 file changed, 92 insertions(+), 66 deletions(-) diff --git a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c b/drivers/g= pu/drm/tests/drm_hdmi_state_helper_test.c index e97efd3af9ed18e6cf8ee66b4923dfc805b34e19..7ffd666753b10bc991894e23820= 6a3c5328d0e23 100644 --- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c +++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c @@ -53,53 +53,10 @@ static struct drm_display_mode *find_preferred_mode(str= uct drm_connector *connec mutex_unlock(&drm->mode_config.mutex); =20 return preferred; } =20 -static int light_up_connector(struct kunit *test, - struct drm_device *drm, - struct drm_crtc *crtc, - struct drm_connector *connector, - struct drm_display_mode *mode, - struct drm_modeset_acquire_ctx *ctx) -{ - struct drm_atomic_state *state; - struct drm_connector_state *conn_state; - struct drm_crtc_state *crtc_state; - int ret; - - state =3D drm_kunit_helper_atomic_state_alloc(test, drm, ctx); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); - -retry: - conn_state =3D drm_atomic_get_connector_state(state, connector); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state); - - ret =3D drm_atomic_set_crtc_for_connector(conn_state, crtc); - if (ret =3D=3D -EDEADLK) { - drm_atomic_state_clear(state); - ret =3D drm_modeset_backoff(ctx); - if (!ret) - goto retry; - } - KUNIT_EXPECT_EQ(test, ret, 0); - - crtc_state =3D drm_atomic_get_crtc_state(state, crtc); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state); - - ret =3D drm_atomic_set_mode_for_crtc(crtc_state, mode); - KUNIT_EXPECT_EQ(test, ret, 0); - - crtc_state->enable =3D true; - crtc_state->active =3D true; - - ret =3D drm_atomic_commit(state); - KUNIT_ASSERT_EQ(test, ret, 0); - - return 0; -} - static int set_connector_edid(struct kunit *test, struct drm_connector *co= nnector, const char *edid, size_t edid_len) { struct drm_atomic_helper_connector_hdmi_priv *priv =3D connector_to_priv(connector); @@ -296,11 +253,14 @@ static void drm_test_check_broadcast_rgb_crtc_mode_ch= anged(struct kunit *test) preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -362,11 +322,14 @@ static void drm_test_check_broadcast_rgb_crtc_mode_no= t_changed(struct kunit *tes preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -430,11 +393,14 @@ static void drm_test_check_broadcast_rgb_auto_cea_mod= e(struct kunit *test) KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -487,11 +453,14 @@ static void drm_test_check_broadcast_rgb_auto_cea_mod= e_vic_1(struct kunit *test) =20 mode =3D drm_kunit_display_mode_from_cea_vic(test, drm, 1); KUNIT_ASSERT_NOT_NULL(test, mode); =20 crtc =3D priv->crtc; - ret =3D light_up_connector(test, drm, crtc, conn, mode, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + mode, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -545,11 +514,14 @@ static void drm_test_check_broadcast_rgb_full_cea_mod= e(struct kunit *test) KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -604,11 +576,14 @@ static void drm_test_check_broadcast_rgb_full_cea_mod= e_vic_1(struct kunit *test) =20 mode =3D drm_kunit_display_mode_from_cea_vic(test, drm, 1); KUNIT_ASSERT_NOT_NULL(test, mode); =20 crtc =3D priv->crtc; - ret =3D light_up_connector(test, drm, crtc, conn, mode, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + mode, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -664,11 +639,14 @@ static void drm_test_check_broadcast_rgb_limited_cea_= mode(struct kunit *test) KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -723,11 +701,14 @@ static void drm_test_check_broadcast_rgb_limited_cea_= mode_vic_1(struct kunit *te =20 mode =3D drm_kunit_display_mode_from_cea_vic(test, drm, 1); KUNIT_ASSERT_NOT_NULL(test, mode); =20 crtc =3D priv->crtc; - ret =3D light_up_connector(test, drm, crtc, conn, mode, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + mode, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -787,11 +768,14 @@ static void drm_test_check_output_bpc_crtc_mode_chang= ed(struct kunit *test) preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -863,11 +847,14 @@ static void drm_test_check_output_bpc_crtc_mode_not_c= hanged(struct kunit *test) preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -939,11 +926,14 @@ static void drm_test_check_output_bpc_dvi(struct kuni= t *test) preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -986,11 +976,14 @@ static void drm_test_check_tmds_char_rate_rgb_8bpc(st= ruct kunit *test) KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1035,11 +1028,14 @@ static void drm_test_check_tmds_char_rate_rgb_10bpc= (struct kunit *test) KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1084,11 +1080,14 @@ static void drm_test_check_tmds_char_rate_rgb_12bpc= (struct kunit *test) KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1132,11 +1131,14 @@ static void drm_test_check_hdmi_funcs_reject_rate(s= truct kunit *test) preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 /* You shouldn't be doing that at home. */ conn->hdmi.funcs =3D &reject_connector_hdmi_funcs; =20 @@ -1206,11 +1208,14 @@ static void drm_test_check_max_tmds_rate_bpc_fallba= ck(struct kunit *test) rate =3D drm_hdmi_compute_mode_clock(preferred, 10, HDMI_COLORSPACE_RGB); KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1280,11 +1285,14 @@ static void drm_test_check_max_tmds_rate_format_fal= lback(struct kunit *test) rate =3D drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV42= 2); KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1345,11 +1353,14 @@ static void drm_test_check_output_bpc_format_vic_1(= struct kunit *test) KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 drm_modeset_acquire_init(&ctx, 0); =20 crtc =3D priv->crtc; - ret =3D light_up_connector(test, drm, crtc, conn, mode, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + mode, + &ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1412,11 +1423,14 @@ static void drm_test_check_output_bpc_format_driver= _rgb_only(struct kunit *test) rate =3D drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV42= 2); KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1481,11 +1495,14 @@ static void drm_test_check_output_bpc_format_displa= y_rgb_only(struct kunit *test rate =3D drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV42= 2); KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1541,11 +1558,14 @@ static void drm_test_check_output_bpc_format_driver= _8bpc_only(struct kunit *test rate =3D drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB); KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1603,11 +1623,14 @@ static void drm_test_check_output_bpc_format_displa= y_8bpc_only(struct kunit *tes rate =3D drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB); KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1643,11 +1666,14 @@ static void drm_test_check_disable_connector(struct= kunit *test) preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 drm =3D &priv->drm; crtc =3D priv->crtc; - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 --=20 2.48.1 From nobody Sun Dec 14 13:53:06 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 ABA4226771F for ; Thu, 13 Mar 2025 12:00:33 +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=1741867233; cv=none; b=VyKukSYbk0AHsQhOeaH3AeRneMFZhlu+R0g2B2F5r1/rqpFvS9XqpVEsnIxW5NCxlm4qvl2PIrXafvl8Sz7pxtGVRc8yZyFou9wm9h175lMUYwn2JD2h0+LhdlYmdQHqQQSvsyvmgiA7aOI/FzS6zaEgFqUwYDwyF2MTL5eYtPU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867233; c=relaxed/simple; bh=eNUkeV7AVLYPrx6JpkksY/XA1qUwL/vhE5SBrSDA1JU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fmgb9TJq25/0pTNci5x4naMSe+F6vTYzjVpUggFlxL/aWT8oD04Cz00tAlIohCi7g0JmuZnZXWKW0ccKvadN3xjJpo9qiI/QgYDJGobJt/iR/HESmyd9KUzjZJ/yWc0PlQMSu+muC84QQVgOSur9LHEuwknEVq2NrLFpKGWB68U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a5soXwnC; 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="a5soXwnC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1867C4CEE5; Thu, 13 Mar 2025 12:00:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741867233; bh=eNUkeV7AVLYPrx6JpkksY/XA1qUwL/vhE5SBrSDA1JU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=a5soXwnCczLmpg4oTe/g5Y5MRlkN3Msj2EGfegDT81/uckcYwgEUaswm/eVhqXYGD rdHHg+0ihE5Gx95GBuVmiy1TYoVypDk1Pi55HrySNuLRmH6PdFdKOq68gXnqPFt05J zZryHL87muFVqgFeA0UIg9NqdNeOQMY+Gp5/bXyB10nx5sHKZA2DyKvUpWOXCqb+Lh I2iW0NP7ebrcJtAJge17b0Nzq+UJkgKTOcWXR/ukkGAIcR5wReK4kyi8aTNKnwvQ5g 5ap2qT7mNYwRY6/GYfv/YUaxnYD8Sk6hLjQzEx5fNwv2eapeuSWDm+HRGOIeZqivMA ves/Ze/nbD5kA== From: Maxime Ripard Date: Thu, 13 Mar 2025 13:00:01 +0100 Subject: [PATCH v6 07/16] drm/tests: Create tests for drm_atomic 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: <20250313-bridge-connector-v6-7-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=5633; i=mripard@kernel.org; h=from:subject:message-id; bh=eNUkeV7AVLYPrx6JpkksY/XA1qUwL/vhE5SBrSDA1JU=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOmXThza1tTP/HPWwWUSj9c/Np936Odq/priJJU93hHWL T55xtIaHaUsDGJcDLJiiiwxwuZL4k7Net3JxjcPZg4rE8gQBi5OAZjIsbWMDN/ti7ksvH62LcpO 0/6z9bzY1K+Hmu5OCpXz2p3whnfPxQCG/56f2kyTKtbM06nR7tv+63XXJjsdZ0eRrsXXTjexBaZ OYwMA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D We don't have a set of kunit tests for the functions under drm_atomic.h. Let's use the introduction of drm_atomic_get_connector_for_encoder() to create some tests for it and thus create that set. Reviewed-by: Dmitry Baryshkov Signed-off-by: Maxime Ripard --- drivers/gpu/drm/tests/Makefile | 1 + drivers/gpu/drm/tests/drm_atomic_test.c | 153 ++++++++++++++++++++++++++++= ++++ 2 files changed, 154 insertions(+) diff --git a/drivers/gpu/drm/tests/Makefile b/drivers/gpu/drm/tests/Makefile index 6691c577d2d4581a4185bac2ce89a6b14b339b35..3afd6587df0831a0d10e91ff0a5= 84af6ba1813e4 100644 --- a/drivers/gpu/drm/tests/Makefile +++ b/drivers/gpu/drm/tests/Makefile @@ -2,10 +2,11 @@ =20 obj-$(CONFIG_DRM_KUNIT_TEST_HELPERS) +=3D \ drm_kunit_helpers.o =20 obj-$(CONFIG_DRM_KUNIT_TEST) +=3D \ + drm_atomic_test.o \ drm_atomic_state_test.o \ drm_bridge_test.o \ drm_buddy_test.o \ drm_cmdline_parser_test.o \ drm_connector_test.o \ diff --git a/drivers/gpu/drm/tests/drm_atomic_test.c b/drivers/gpu/drm/test= s/drm_atomic_test.c new file mode 100644 index 0000000000000000000000000000000000000000..ea91bec6569e688ad33149d8ee6= ecc3562b61254 --- /dev/null +++ b/drivers/gpu/drm/tests/drm_atomic_test.c @@ -0,0 +1,153 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Kunit test for drm_atomic functions + */ +#include +#include +#include +#include +#include +#include + +#include + +struct drm_atomic_test_priv { + struct drm_device drm; + struct drm_plane *plane; + struct drm_crtc *crtc; + struct drm_encoder encoder; + struct drm_connector connector; +}; + +static const struct drm_connector_helper_funcs drm_atomic_init_connector_h= elper_funcs =3D { +}; + +static const struct drm_connector_funcs drm_atomic_init_connector_funcs = =3D { + .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, + .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, + .reset =3D drm_atomic_helper_connector_reset, +}; + +static struct drm_atomic_test_priv *create_device(struct kunit *test) +{ + struct drm_atomic_test_priv *priv; + struct drm_connector *connector; + struct drm_encoder *enc; + struct drm_device *drm; + struct drm_plane *plane; + struct drm_crtc *crtc; + struct device *dev; + int ret; + + dev =3D drm_kunit_helper_alloc_device(test); + if (IS_ERR(dev)) + return ERR_CAST(dev); + + priv =3D drm_kunit_helper_alloc_drm_device(test, dev, + struct drm_atomic_test_priv, drm, + DRIVER_MODESET | DRIVER_ATOMIC); + if (IS_ERR(priv)) + return ERR_CAST(priv); + + drm =3D &priv->drm; + plane =3D drm_kunit_helper_create_primary_plane(test, drm, + NULL, + NULL, + NULL, 0, + NULL); + if (IS_ERR(plane)) + return ERR_CAST(plane); + priv->plane =3D plane; + + crtc =3D drm_kunit_helper_create_crtc(test, drm, + plane, NULL, + NULL, + NULL); + if (IS_ERR(crtc)) + return ERR_CAST(crtc); + priv->crtc =3D crtc; + + enc =3D &priv->encoder; + ret =3D drmm_encoder_init(drm, enc, NULL, DRM_MODE_ENCODER_TMDS, NULL); + if (ret) + return ERR_PTR(ret); + + enc->possible_crtcs =3D drm_crtc_mask(crtc); + + connector =3D &priv->connector; + ret =3D drmm_connector_init(drm, connector, + &drm_atomic_init_connector_funcs, + DRM_MODE_CONNECTOR_VIRTUAL, + NULL); + if (ret) + return ERR_PTR(ret); + + drm_connector_helper_add(connector, &drm_atomic_init_connector_helper_fun= cs); + + drm_connector_attach_encoder(connector, enc); + + drm_mode_config_reset(drm); + + return priv; +} + +static void drm_test_drm_atomic_get_connector_for_encoder(struct kunit *te= st) +{ + struct drm_modeset_acquire_ctx ctx; + struct drm_atomic_test_priv *priv; + struct drm_display_mode *mode; + struct drm_connector *curr_connector; + int ret; + + priv =3D create_device(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); + + mode =3D drm_kunit_display_mode_from_cea_vic(test, &priv->drm, 16); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, mode); + + drm_modeset_acquire_init(&ctx, 0); + +retry_enable: + ret =3D drm_kunit_helper_enable_crtc_connector(test, &priv->drm, + priv->crtc, &priv->connector, + mode, &ctx); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_enable; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); + + drm_modeset_acquire_init(&ctx, 0); + +retry_conn: + curr_connector =3D drm_atomic_get_connector_for_encoder(&priv->encoder, + &ctx); + if (PTR_ERR(curr_connector) =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_conn; + } + KUNIT_EXPECT_PTR_EQ(test, curr_connector, &priv->connector); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); +} + +static struct kunit_case drm_atomic_get_connector_for_encoder_tests[] =3D { + KUNIT_CASE(drm_test_drm_atomic_get_connector_for_encoder), + { } +}; + + +static struct kunit_suite drm_atomic_get_connector_for_encoder_test_suite = =3D { + .name =3D "drm_test_atomic_get_connector_for_encoder", + .test_cases =3D drm_atomic_get_connector_for_encoder_tests, +}; + +kunit_test_suite(drm_atomic_get_connector_for_encoder_test_suite); + +MODULE_AUTHOR("Maxime Ripard "); +MODULE_DESCRIPTION("Kunit test for drm_atomic functions"); +MODULE_LICENSE("GPL"); --=20 2.48.1 From nobody Sun Dec 14 13:53:06 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 F2741267AE6 for ; Thu, 13 Mar 2025 12:00:35 +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=1741867236; cv=none; b=CtLX7IOy794Pkrg907eC6+gqU1YjcxHf3x6R8jug3bUB2dDHaTM2ByYRRZU5CwPQsBeOPXAw1laV9ZQDZZURLDeb/C+yxOHd/R2ExX6dFzfWjSHYqJT6xKI2JdiRowP1LOeOs5lQeQflXsomIvPRVfzHaGsPBP9r68mJlNOctpQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867236; c=relaxed/simple; bh=PP4+cvT7+0DeLYcQyZYn6yS9W7xkv5JVcjFqL2cYdYc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PNAggkGcouPp1m/MKpRoanOt9187/vk5HcFvggFP0SvUBR0oO4L0YiapFjiv0PCPDSaGLn4bPJMvpHqG+0sTE25BWhe6sGyYECh0bdQJtjK8uo6QgQGXO032IUdb0RkenuLRyj0Y5gfMGVJw/SMtt9Qia9Qf95KYWdVBBMXzhcc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IlceUVVa; 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="IlceUVVa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FEA0C4AF09; Thu, 13 Mar 2025 12:00:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741867235; bh=PP4+cvT7+0DeLYcQyZYn6yS9W7xkv5JVcjFqL2cYdYc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=IlceUVVaKrJgABzdc5jbHw5HoRkMLfLgQXiHkw/lItdEojAXdsqiuo8a1mUttvKgm ik62B3mQ31P5K6KXadVWaMTTi1fxFkvSn26mK5bs4BLRAI3lIHOqAGp2+s4mUenbbY 1wEpn7DEEYLu9zdzd/pAtgqjo76ikwOnOoHOOpd/TKdm/sr3/x4J8dAFNUy43sVUhF EItBYKbMRg30wvsjun0TVJ2ZI3O8Vl77ZWSWF3jqPj0mHQ6Z8jsh4NjH46cceBwuY/ YZKpM4NeCAilsST/wDE1BEBr/q/mHOHqpFabcVsSKITUptNuhewsed4SuGmTE51Fnc 0uhrSz86g78gQ== From: Maxime Ripard Date: Thu, 13 Mar 2025 13:00:02 +0100 Subject: [PATCH v6 08/16] drm/bridge: Add helper to reset bridge pipeline 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: <20250313-bridge-connector-v6-8-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 , Simona Vetter , Simona Vetter X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4759; i=mripard@kernel.org; h=from:subject:message-id; bh=PP4+cvT7+0DeLYcQyZYn6yS9W7xkv5JVcjFqL2cYdYc=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOmXThxmsRcrffC3s1v39O/e0wzhwaU75YN+X3gfWC7tH 5Tqci+5o5SFQYyLQVZMkSVG2HxJ3KlZrzvZ+ObBzGFlAhnCwMUpABOZ9omRoUtbpYU/PmXu2W/x VU//KRxetv24jfes6Wtv3w0/kPJLXZOR4buCq+4LhS+8FzaEFaYpLld9furMyXtCd7cvCH1Tacj 0nAEA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Let's provide an helper to make it easier for bridge drivers to power-cycle their bridge. In order to avoid a circular dependency between that new helper and drm_atomic_helper_reset_crtc(), this new helper will be in a drm_bridge_helper.c file to follow the pattern we have for other objects. Reviewed-by: Herve Codina Reviewed-by: Simona Vetter Tested-by: Herve Codina Co-developed-by: Simona Vetter Signed-off-by: Simona Vetter Signed-off-by: Maxime Ripard --- drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/drm_atomic_helper.c | 3 ++ drivers/gpu/drm/drm_bridge_helper.c | 58 +++++++++++++++++++++++++++++++++= ++++ include/drm/drm_bridge_helper.h | 12 ++++++++ 4 files changed, 74 insertions(+) diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 4cd054188faf0b3dec442efd99ae52604541bce1..5a332f7d3ecccb6e5e1fb9fb811= eab7aa5a84a21 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -131,10 +131,11 @@ obj-$(CONFIG_DRM_TTM_HELPER) +=3D drm_ttm_helper.o # =20 drm_kms_helper-y :=3D \ drm_atomic_helper.o \ drm_atomic_state_helper.o \ + drm_bridge_helper.o \ drm_crtc_helper.o \ drm_damage_helper.o \ drm_flip_work.o \ drm_format_helper.o \ drm_gem_atomic_helper.o \ diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atom= ic_helper.c index 5302ab3248985d3e0a47e40fd3deb7ad0d9f775b..ee64ca1b1becc74336a8919c60a= 73656e23e0047 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3407,10 +3407,13 @@ EXPORT_SYMBOL(drm_atomic_helper_disable_all); * * Reset the active outputs by indicating that connectors have changed. * This implies a reset of all active components available between the CRT= C and * connectors. * + * A variant of this function exists with + * drm_bridge_helper_reset_crtc(), dedicated to bridges. + * * NOTE: This relies on resetting &drm_crtc_state.connectors_changed. * For drivers which optimize out unnecessary modesets this will result in * a no-op commit, achieving nothing. * * Returns: diff --git a/drivers/gpu/drm/drm_bridge_helper.c b/drivers/gpu/drm/drm_brid= ge_helper.c new file mode 100644 index 0000000000000000000000000000000000000000..af80d249619495fc63df3b4a1e3= 425e7f938a4d2 --- /dev/null +++ b/drivers/gpu/drm/drm_bridge_helper.c @@ -0,0 +1,58 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#include +#include +#include +#include +#include + +/** + * drm_bridge_helper_reset_crtc - Reset the pipeline feeding a bridge + * @bridge: DRM bridge to reset + * @ctx: lock acquisition context + * + * Reset a @bridge pipeline. It will power-cycle all active components + * between the CRTC and connector that bridge is connected to. + * + * As it relies on drm_atomic_helper_reset_crtc(), the same limitations + * apply. + * + * Returns: + * + * 0 on success or a negative error code on failure. If the error + * returned is EDEADLK, the whole atomic sequence must be restarted. + */ +int drm_bridge_helper_reset_crtc(struct drm_bridge *bridge, + struct drm_modeset_acquire_ctx *ctx) +{ + struct drm_connector *connector; + struct drm_encoder *encoder =3D bridge->encoder; + struct drm_device *dev =3D encoder->dev; + struct drm_crtc *crtc; + int ret; + + ret =3D drm_modeset_lock(&dev->mode_config.connection_mutex, ctx); + if (ret) + return ret; + + connector =3D drm_atomic_get_connector_for_encoder(encoder, ctx); + if (IS_ERR(connector)) { + ret =3D PTR_ERR(connector); + goto out; + } + + if (!connector->state) { + ret =3D -EINVAL; + goto out; + } + + crtc =3D connector->state->crtc; + ret =3D drm_atomic_helper_reset_crtc(crtc, ctx); + if (ret) + goto out; + +out: + drm_modeset_unlock(&dev->mode_config.connection_mutex); + return ret; +} +EXPORT_SYMBOL(drm_bridge_helper_reset_crtc); diff --git a/include/drm/drm_bridge_helper.h b/include/drm/drm_bridge_helpe= r.h new file mode 100644 index 0000000000000000000000000000000000000000..6c35b479ec2a84aa43283351a6f= 18e49a9f9c177 --- /dev/null +++ b/include/drm/drm_bridge_helper.h @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#ifndef __DRM_BRIDGE_HELPER_H_ +#define __DRM_BRIDGE_HELPER_H_ + +struct drm_bridge; +struct drm_modeset_acquire_ctx; + +int drm_bridge_helper_reset_crtc(struct drm_bridge *bridge, + struct drm_modeset_acquire_ctx *ctx); + +#endif // __DRM_BRIDGE_HELPER_H_ --=20 2.48.1 From nobody Sun Dec 14 13:53:06 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 BC8EA267B04 for ; Thu, 13 Mar 2025 12:00:38 +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=1741867238; cv=none; b=crhPn3z/bymSr8OFUwO8Emsw1dYptSM7aptZw3C3pxHGUpChVZNYISJo38zmd0g2IXUlErYN2SqrXZYHKXNhwYha+H0QdGA68L4ti7fb78s9Cp8sgHvWCXqeNZdQd+gst22EBOV+TL53LHDtgyM7ZSwkWquIIKlsxgl1LMk/mVM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867238; c=relaxed/simple; bh=ftdIwsjmLXoIk6CM48IyctmPnT/90xD8ZSeUkKWs8ug=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AVDtkgK/rXgjp6Eh5XaupVLDQMel62WaqG3VptuzPdfO29XOQSOOqnYR+5XEg1rSzKgcjfwVh0qrvQgKr6VkBoRn0DzGGCFa55X+YyoCRZikqze53BEkP3eGC974XPbmmk1oHKo7M4V7AR55cQVkeTF9e12ENUyg5KYkrTjf7FU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jx9YkFDU; 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="jx9YkFDU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 489B9C4CEDD; Thu, 13 Mar 2025 12:00:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741867238; bh=ftdIwsjmLXoIk6CM48IyctmPnT/90xD8ZSeUkKWs8ug=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=jx9YkFDUTsV71mojJio5YxLLYMf45Co7363q8bQc6F2EAM/uoSukXcPJPdIJIxdc0 dwubkmwoEAfXrC8O031EyKID9JzZRkGcDyr+zE2uLZyuZuUdrUod/bxekJ0iDQg2Va LSnchOGyIe84nXaDq3hKaXMpzuR16YWugnwwxtq+23JwK16lMmJOIuVRiAoGn/egj5 rct9tm7wOR6cZ7hXibviKwHJ1v7sCJFuWtXxqAGChUrqHuJvRS4nTHshx0UapPwaO8 ZZSGptOVoD6YEFmV73Df+H80aUuO/2ginM2lavW92YLOXDAbciAhjLtBD0QjM9z1EU dH5u14bw6lU6w== From: Maxime Ripard Date: Thu, 13 Mar 2025 13:00:03 +0100 Subject: [PATCH v6 09/16] drm/tests: bridge: Provide tests for drm_bridge_helper_reset_crtc 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: <20250313-bridge-connector-v6-9-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=7995; i=mripard@kernel.org; h=from:subject:message-id; bh=ftdIwsjmLXoIk6CM48IyctmPnT/90xD8ZSeUkKWs8ug=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOmXThzexZacfDeieLnz2Wn3IxxeznyY8jJeX1xX+5bb5 PXHI6/4dJSyMIhxMciKKbLECJsviTs163UnG988mDmsTCBDGLg4BWAiV50Y/vDNualzbvPifn+W 93HHzmh93qBu4yT3I9g1JeNP9bcZCX2MDPM22igsyGxbH1jPHiWvt2ve9fn7jzueWNnh8MZhAUe 9LhcA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Let's provide a bunch of kunit tests to make sure drm_bridge_helper_reset_crtc() works as expected. Reviewed-by: Dmitry Baryshkov Signed-off-by: Maxime Ripard --- drivers/gpu/drm/tests/drm_bridge_test.c | 209 ++++++++++++++++++++++++++++= +++- 1 file changed, 208 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/tests/drm_bridge_test.c b/drivers/gpu/drm/test= s/drm_bridge_test.c index c0a05c459d957c3f9d281957f002f6bd36cce367..ff88ec2e911c9cc9a718483f09d= 4c764f45f991a 100644 --- a/drivers/gpu/drm/tests/drm_bridge_test.c +++ b/drivers/gpu/drm/tests/drm_bridge_test.c @@ -3,10 +3,11 @@ * Kunit test for drm_bridge functions */ #include #include #include +#include #include =20 #include =20 struct drm_bridge_init_priv { @@ -14,16 +15,56 @@ struct drm_bridge_init_priv { struct drm_plane *plane; struct drm_crtc *crtc; struct drm_encoder encoder; struct drm_bridge bridge; struct drm_connector *connector; + unsigned int enable_count; + unsigned int disable_count; }; =20 +static void drm_test_bridge_enable(struct drm_bridge *bridge) +{ + struct drm_bridge_init_priv *priv =3D + container_of(bridge, struct drm_bridge_init_priv, bridge); + + priv->enable_count++; +} + +static void drm_test_bridge_disable(struct drm_bridge *bridge) +{ + struct drm_bridge_init_priv *priv =3D + container_of(bridge, struct drm_bridge_init_priv, bridge); + + priv->disable_count++; +} + static const struct drm_bridge_funcs drm_test_bridge_legacy_funcs =3D { + .enable =3D drm_test_bridge_enable, + .disable =3D drm_test_bridge_disable, }; =20 +static void drm_test_bridge_atomic_enable(struct drm_bridge *bridge, + struct drm_atomic_state *state) +{ + struct drm_bridge_init_priv *priv =3D + container_of(bridge, struct drm_bridge_init_priv, bridge); + + priv->enable_count++; +} + +static void drm_test_bridge_atomic_disable(struct drm_bridge *bridge, + struct drm_atomic_state *state) +{ + struct drm_bridge_init_priv *priv =3D + container_of(bridge, struct drm_bridge_init_priv, bridge); + + priv->disable_count++; +} + static const struct drm_bridge_funcs drm_test_bridge_atomic_funcs =3D { + .atomic_enable =3D drm_test_bridge_atomic_enable, + .atomic_disable =3D drm_test_bridge_atomic_disable, .atomic_destroy_state =3D drm_atomic_helper_bridge_destroy_state, .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, .atomic_reset =3D drm_atomic_helper_bridge_reset, }; =20 @@ -201,10 +242,176 @@ static struct kunit_case drm_bridge_get_current_stat= e_tests[] =3D { static struct kunit_suite drm_bridge_get_current_state_test_suite =3D { .name =3D "drm_test_bridge_get_current_state", .test_cases =3D drm_bridge_get_current_state_tests, }; =20 -kunit_test_suite(drm_bridge_get_current_state_test_suite); +/* + * Test that an atomic bridge is properly power-cycled when calling + * drm_bridge_helper_reset_crtc(). + */ +static void drm_test_drm_bridge_helper_reset_crtc_atomic(struct kunit *tes= t) +{ + struct drm_modeset_acquire_ctx ctx; + struct drm_bridge_init_priv *priv; + struct drm_display_mode *mode; + struct drm_bridge *bridge; + int ret; + + priv =3D drm_test_bridge_init(test, &drm_test_bridge_atomic_funcs); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); + + mode =3D drm_kunit_display_mode_from_cea_vic(test, &priv->drm, 16); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, mode); + + drm_modeset_acquire_init(&ctx, 0); + +retry_commit: + ret =3D drm_kunit_helper_enable_crtc_connector(test, + &priv->drm, priv->crtc, + priv->connector, + mode, + &ctx); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_commit; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); + + bridge =3D &priv->bridge; + KUNIT_ASSERT_EQ(test, priv->enable_count, 1); + KUNIT_ASSERT_EQ(test, priv->disable_count, 0); + + drm_modeset_acquire_init(&ctx, 0); + +retry_reset: + ret =3D drm_bridge_helper_reset_crtc(bridge, &ctx); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_reset; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); + + KUNIT_EXPECT_EQ(test, priv->enable_count, 2); + KUNIT_EXPECT_EQ(test, priv->disable_count, 1); +} + +/* + * Test that calling drm_bridge_helper_reset_crtc() on a disabled atomic + * bridge will fail and not call the enable / disable callbacks + */ +static void drm_test_drm_bridge_helper_reset_crtc_atomic_disabled(struct k= unit *test) +{ + struct drm_modeset_acquire_ctx ctx; + struct drm_bridge_init_priv *priv; + struct drm_display_mode *mode; + struct drm_bridge *bridge; + int ret; + + priv =3D drm_test_bridge_init(test, &drm_test_bridge_atomic_funcs); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); + + mode =3D drm_kunit_display_mode_from_cea_vic(test, &priv->drm, 16); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, mode); + + bridge =3D &priv->bridge; + KUNIT_ASSERT_EQ(test, priv->enable_count, 0); + KUNIT_ASSERT_EQ(test, priv->disable_count, 0); + + drm_modeset_acquire_init(&ctx, 0); + +retry_reset: + ret =3D drm_bridge_helper_reset_crtc(bridge, &ctx); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_reset; + } + KUNIT_EXPECT_LT(test, ret, 0); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); + + KUNIT_EXPECT_EQ(test, priv->enable_count, 0); + KUNIT_EXPECT_EQ(test, priv->disable_count, 0); +} + +/* + * Test that a non-atomic bridge is properly power-cycled when calling + * drm_bridge_helper_reset_crtc(). + */ +static void drm_test_drm_bridge_helper_reset_crtc_legacy(struct kunit *tes= t) +{ + struct drm_modeset_acquire_ctx ctx; + struct drm_bridge_init_priv *priv; + struct drm_display_mode *mode; + struct drm_bridge *bridge; + int ret; + + priv =3D drm_test_bridge_init(test, &drm_test_bridge_legacy_funcs); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); + + mode =3D drm_kunit_display_mode_from_cea_vic(test, &priv->drm, 16); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, mode); + + drm_modeset_acquire_init(&ctx, 0); + +retry_commit: + ret =3D drm_kunit_helper_enable_crtc_connector(test, + &priv->drm, priv->crtc, + priv->connector, + mode, + &ctx); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_commit; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); + + bridge =3D &priv->bridge; + KUNIT_ASSERT_EQ(test, priv->enable_count, 1); + KUNIT_ASSERT_EQ(test, priv->disable_count, 0); + + drm_modeset_acquire_init(&ctx, 0); + +retry_reset: + ret =3D drm_bridge_helper_reset_crtc(bridge, &ctx); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_reset; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); + + KUNIT_EXPECT_EQ(test, priv->enable_count, 2); + KUNIT_EXPECT_EQ(test, priv->disable_count, 1); +} + +static struct kunit_case drm_bridge_helper_reset_crtc_tests[] =3D { + KUNIT_CASE(drm_test_drm_bridge_helper_reset_crtc_atomic), + KUNIT_CASE(drm_test_drm_bridge_helper_reset_crtc_atomic_disabled), + KUNIT_CASE(drm_test_drm_bridge_helper_reset_crtc_legacy), + { } +}; + +static struct kunit_suite drm_bridge_helper_reset_crtc_test_suite =3D { + .name =3D "drm_test_bridge_helper_reset_crtc", + .test_cases =3D drm_bridge_helper_reset_crtc_tests, +}; + +kunit_test_suites( + &drm_bridge_get_current_state_test_suite, + &drm_bridge_helper_reset_crtc_test_suite, +); =20 MODULE_AUTHOR("Maxime Ripard "); MODULE_DESCRIPTION("Kunit test for drm_bridge functions"); MODULE_LICENSE("GPL"); --=20 2.48.1 From nobody Sun Dec 14 13:53:06 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 8465A26739B for ; Thu, 13 Mar 2025 12:00:41 +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=1741867241; cv=none; b=J9LKxDPi7qnKng+2tn9U/DRvhaaToq4WFfWIMoDpe1OLLPadVgXZ9gXdRvBG9jUhGzIzZ7l5V1wWha6MUR3Cw7pbPYhY0ilbnBQRhT6KBtHrfLUfNp4a4ZeXsI/VxFzZ509IlRB+BdgzxScJW37HTGKaBIZ1SPmjC1bD5oNO+T8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867241; c=relaxed/simple; bh=QLjBmBTGFfvbamTwOqNwPh8p1mjv/71jpgSOsVZUA0U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Uroe7Ukx/qAt8Sfi2dUGsyL340BSdlG0HpZu4XFySD6lO7yvOSN/KNxW3CJMFKvjL3MGGB6IIjlWDN9htRW5ZE9+PX4ChzbD2GN1Mn0xR1XcxHLx2EPfJbYCfOc+/lepMF8dFbaUtI3N6lnqZ8EDoyO3jnbLpvgTeG98SVDkNIQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=W2O4IuLt; 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="W2O4IuLt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1158AC4CEDD; Thu, 13 Mar 2025 12:00:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741867241; bh=QLjBmBTGFfvbamTwOqNwPh8p1mjv/71jpgSOsVZUA0U=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=W2O4IuLt4EI8XYUmU3AyzT4SNvo4QGX34YQf1DaVVDH5GTR618Z6uTPCfmbmTQrt5 T5Vhnv4gEEQDVOySY3wAa9PciJ547m/I3BjuoEojBB/QLQKzB8AY2P0f8+HdHuBgAp 9X3hdpfWoY/465L2rVxrmnj9ofnJeLs0qBdC501RoJy9W87+o36ihXFiIU6eTP7AQP 8M896NdgOMYjhCh3i5/PxPWdzpU47XSUe5TNJ3W/Uehm8BQGU6FfjjYQUx3UXNNNR9 hAf8S+nwymhNQow9Khef3Kn5fRGtV9vMLpAmX9oIt5Cl4L4rXqUiGnSdG270JP4wn0 3T9SSc0H3g+yw== From: Maxime Ripard Date: Thu, 13 Mar 2025 13:00:04 +0100 Subject: [PATCH v6 10/16] drm/bridge: ti-sn65dsi83: Switch to drm_bridge_helper_reset_crtc 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: <20250313-bridge-connector-v6-10-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=2594; i=mripard@kernel.org; h=from:subject:message-id; bh=QLjBmBTGFfvbamTwOqNwPh8p1mjv/71jpgSOsVZUA0U=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOmXThz5ZsSn+yhCV1nfIkBbI2fVfheP1UvzrjIrmswye da/Jcmuo5SFQYyLQVZMkSVG2HxJ3KlZrzvZ+ObBzGFlAhnCwMUpABOZfJzhD2+B972lLh6PpY8u XXXxgE2w+ddVaht+HJ4RvWtq/+vEP7sY/hfPeX/z3mb+vOMuMve23GBUcnfOyQqflckYeuhEpX+ xFT8A X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Now that we have a helper for bridge drivers to call to reset the output pipeline, let's use it. Reviewed-by: Dmitry Baryshkov Reviewed-by: Herve Codina Tested-by: Herve Codina Signed-off-by: Maxime Ripard --- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi83.c b/drivers/gpu/drm/bridge= /ti-sn65dsi83.c index 7122a3ebd88399ed32420fcaf9f1f9384d031d2d..53cc4cfb0c884f6a410e3df2c4d= f4572f89c0768 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi83.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi83.c @@ -38,11 +38,11 @@ #include #include =20 #include #include -#include /* DRM_MODESET_LOCK_ALL_BEGIN() needs drm_drv_use= s_atomic_modeset() */ +#include #include #include #include #include =20 @@ -369,11 +369,10 @@ static u8 sn65dsi83_get_dsi_div(struct sn65dsi83 *ctx) return dsi_div - 1; } =20 static int sn65dsi83_reset_pipe(struct sn65dsi83 *sn65dsi83) { - struct drm_device *dev =3D sn65dsi83->bridge.dev; struct drm_modeset_acquire_ctx ctx; int err; =20 /* * Reset active outputs of the related CRTC. @@ -384,30 +383,25 @@ static int sn65dsi83_reset_pipe(struct sn65dsi83 *sn6= 5dsi83) * bridge. * * Keep the lock during the whole operation to be atomic. */ =20 - DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, err); - - if (!sn65dsi83->bridge.encoder->crtc) { - /* - * No CRTC attached -> No CRTC active outputs to reset - * This can happen when the SN65DSI83 is reset. Simply do - * nothing without returning any errors. - */ - err =3D 0; - goto end; - } + drm_modeset_acquire_init(&ctx, 0); =20 dev_warn(sn65dsi83->dev, "reset the pipe\n"); =20 - err =3D drm_atomic_helper_reset_crtc(sn65dsi83->bridge.encoder->crtc, &ct= x); +retry: + err =3D drm_bridge_helper_reset_crtc(&sn65dsi83->bridge, &ctx); + if (err =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry; + } =20 -end: - DRM_MODESET_LOCK_ALL_END(dev, ctx, err); + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); =20 - return err; + return 0; } =20 static void sn65dsi83_reset_work(struct work_struct *ws) { struct sn65dsi83 *ctx =3D container_of(ws, struct sn65dsi83, reset_work); --=20 2.48.1 From nobody Sun Dec 14 13:53:06 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 B326D266EF8 for ; Thu, 13 Mar 2025 12:00:44 +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=1741867245; cv=none; b=ujL6WCFqJmjlYYcHitzfCm3ATJru/93bVgsORFlRU8Xw/5vXkpt+Zn6XLlz4bhVfhUJvnoqrNj1pqje18m9M/Bv4ANKJZuSmfOa8Y9tezj5rGl6A1DFBQLXcQrzOm56PpV4PRfpQnARD1eV5Rko2uSj+XfxXw38dK/S0u9MbKlc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867245; c=relaxed/simple; bh=EUewhanqsgL3E4pPLl8bCzs5JweSDQRhJsHCwfNO/+s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=l1AEv6sVIZYUG/IiFwyIaQh0MEUoShfu3FwPAbnCD6IYHUKUbWh1/5gtG+RfQVi6YPuYKADhoJvBeAvkzYs+Z0UrLTIQsCb2B4bmQjLPR8+dnd1iLIT7TJ0Zg3D9mmmhRM177qBWvEQfWdRw1bGJCuGbR7Xcv5yq3TCHrQjUiJ8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NvpVCLn+; 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="NvpVCLn+" 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 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: <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 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..ef98e21dc593f38a2d3c67b8500= 32ece38bec5e8 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_priva= te_obj *obj, static const struct drm_private_state_funcs drm_bridge_priv_state_funcs = =3D { .atomic_duplicate_state =3D drm_bridge_atomic_duplicate_priv_state, .atomic_destroy_state =3D drm_bridge_atomic_destroy_priv_state, }; =20 +static bool drm_bridge_is_atomic(struct drm_bridge *bridge) +{ + return bridge->funcs->atomic_reset !=3D 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, st= ruct drm_bridge *bridge, ret =3D bridge->funcs->attach(bridge, encoder, flags); if (ret < 0) goto err_reset_bridge; } =20 - if (bridge->funcs->atomic_reset) { + if (drm_bridge_is_atomic(bridge)) { struct drm_bridge_state *state; =20 state =3D bridge->funcs->atomic_reset(bridge); if (IS_ERR(state)) { ret =3D PTR_ERR(state); @@ -376,11 +381,11 @@ void drm_bridge_detach(struct drm_bridge *bridge) return; =20 if (WARN_ON(!bridge->dev)) return; =20 - if (bridge->funcs->atomic_reset) + if (drm_bridge_is_atomic(bridge)) drm_atomic_private_obj_fini(&bridge->base); =20 if (bridge->funcs->detach) bridge->funcs->detach(bridge); =20 --=20 2.48.1 From nobody Sun Dec 14 13:53:06 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 2F36E267393 for ; Thu, 13 Mar 2025 12:00:46 +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=1741867247; cv=none; b=TUsddjBS8I7A7xaauouqOi7uleCs4RhknUhIEf0yB11/Z9DUrpNwX3JPElggG1btVCgX8434cKJ29sqSPEufU4x1nigI3ZBckVaAfxGfWUaT/GMk663v69Ma/eBvrL71uI+SEJR5IB5mC2e6b4IPLY/Y0AUgGvoXHjXIELYa99Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867247; c=relaxed/simple; bh=Z8DL/EfDlcq69p6mKKmu1mSIB6ysWUIqx05ZFHNUr4s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rHVEghp9JWMU6lDd9DkFhaNcg5dIp8azfdGNHXMiIn+4yaKWTx+383UXInow3fdOvQO7EMcLl0aNdREfC2WZsLMiDNM3xCBmZieK7N8xy2vGr7+hgO2vsE6rcOAEUm1LD6t07R0Gl9XBih4PhkVQmyhcWdF2fMsOGDuDZ1Ifb4I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uL35nksl; 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="uL35nksl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5BB85C4CEEA; Thu, 13 Mar 2025 12:00:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741867246; bh=Z8DL/EfDlcq69p6mKKmu1mSIB6ysWUIqx05ZFHNUr4s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=uL35nksljLEW4uFZC+nZmvjoFeEBlz2jYR31lVzG0EB4ohQJ6UwoeJXo6+cKQc4z5 NSYZERoAhB7b2F0KjeEGHZVTXVeN9gR8j4GFC+KVmrUF79RgRLv1jYdUYhH0L7phta IFh9cI+IM3/OqENfmZPC37bG5mBmacghu4+WLN3eN9nQYaXEiK6fDRmb6iswVL6Qss PZ3BnucOZ8I91ehZpZmobrHeKMeqqVWr1Mz4bTBmu4F1anEwd9emP0kyD4p7qfjKbU zgB5yMmPHR2OSKImuDyv5P7w7YcuPhUaaW9rQKQT8QD2teqftToGSkHYkJCbgOrFuk fA2efsM4pRc2w== From: Maxime Ripard Date: Thu, 13 Mar 2025 13:00:06 +0100 Subject: [PATCH v6 12/16] drm/bridge: cdns-csi: Switch to atomic helpers 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: <20250313-bridge-connector-v6-12-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=4929; i=mripard@kernel.org; h=from:subject:message-id; bh=Z8DL/EfDlcq69p6mKKmu1mSIB6ysWUIqx05ZFHNUr4s=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOmXThwNPXxZWINhycH6V1L2ta6K7zVambPbbBi59gRzT Y2S4m/pKGVhEONikBVTZIkRNl8Sd2rW6042vnkwc1iZQIYwcHEKwESYnjP8L1JdoqErGMmy4vfF bc49X+bd3fcmw2F97HlOa8G3qvM/HWT4Z806k0+3+BDLkSVX+VZcNrl+qk9V3S+0cg5PeqObaUU AGwA= X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D The Cadence DSI driver follows the drm_encoder->crtc pointer that is deprecated and shouldn't be used by atomic drivers. Fortunately, the atomic hooks provide the drm_atomic_state and we can access our current CRTC from that, going from the bridge to its encoder, to its connector, and to its CRTC. Let's convert this bridge driver to atomic so we can get rid of the drm_encoder->crtc dereference. Reviewed-by: Dmitry Baryshkov Signed-off-by: Maxime Ripard --- drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c | 31 ++++++++++++++++++----= ---- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c b/drivers/gpu/d= rm/bridge/cadence/cdns-dsi-core.c index 8f54c034ac4f3e82c38607a0e52d4745654b571f..99d43944fb8fc685520b78732cd= 1181175ff7cc9 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c +++ b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c @@ -654,11 +654,12 @@ cdns_dsi_bridge_mode_valid(struct drm_bridge *bridge, return MODE_BAD; =20 return MODE_OK; } =20 -static void cdns_dsi_bridge_disable(struct drm_bridge *bridge) +static void cdns_dsi_bridge_atomic_disable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { struct cdns_dsi_input *input =3D bridge_to_cdns_dsi_input(bridge); struct cdns_dsi *dsi =3D input_to_dsi(input); u32 val; =20 @@ -674,11 +675,12 @@ static void cdns_dsi_bridge_disable(struct drm_bridge= *bridge) dsi->platform_ops->disable(dsi); =20 pm_runtime_put(dsi->base.dev); } =20 -static void cdns_dsi_bridge_post_disable(struct drm_bridge *bridge) +static void cdns_dsi_bridge_atomic_post_disable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { struct cdns_dsi_input *input =3D bridge_to_cdns_dsi_input(bridge); struct cdns_dsi *dsi =3D input_to_dsi(input); =20 pm_runtime_put(dsi->base.dev); @@ -751,17 +753,21 @@ static void cdns_dsi_init_link(struct cdns_dsi *dsi) writel(val, dsi->regs + MCTL_MAIN_EN); =20 dsi->link_initialized =3D true; } =20 -static void cdns_dsi_bridge_enable(struct drm_bridge *bridge) +static void cdns_dsi_bridge_atomic_enable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { struct cdns_dsi_input *input =3D bridge_to_cdns_dsi_input(bridge); struct cdns_dsi *dsi =3D input_to_dsi(input); struct cdns_dsi_output *output =3D &dsi->output; + struct drm_connector_state *conn_state; + struct drm_crtc_state *crtc_state; struct drm_display_mode *mode; struct phy_configure_opts_mipi_dphy *phy_cfg =3D &output->phy_opts.mipi_d= phy; + struct drm_connector *connector; unsigned long tx_byte_period; struct cdns_dsi_cfg dsi_cfg; u32 tmp, reg_wakeup, div; int nlanes; =20 @@ -769,11 +775,14 @@ static void cdns_dsi_bridge_enable(struct drm_bridge = *bridge) return; =20 if (dsi->platform_ops && dsi->platform_ops->enable) dsi->platform_ops->enable(dsi); =20 - mode =3D &bridge->encoder->crtc->state->adjusted_mode; + connector =3D drm_atomic_get_new_connector_for_encoder(state, bridge->enc= oder); + conn_state =3D drm_atomic_get_new_connector_state(state, connector); + crtc_state =3D drm_atomic_get_new_crtc_state(state, conn_state->crtc); + mode =3D &crtc_state->adjusted_mode; nlanes =3D output->dev->lanes; =20 WARN_ON_ONCE(cdns_dsi_check_conf(dsi, mode, &dsi_cfg, false)); =20 cdns_dsi_hs_init(dsi); @@ -891,11 +900,12 @@ static void cdns_dsi_bridge_enable(struct drm_bridge = *bridge) =20 tmp =3D readl(dsi->regs + MCTL_MAIN_EN) | IF_EN(input->id); writel(tmp, dsi->regs + MCTL_MAIN_EN); } =20 -static void cdns_dsi_bridge_pre_enable(struct drm_bridge *bridge) +static void cdns_dsi_bridge_atomic_pre_enable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { struct cdns_dsi_input *input =3D bridge_to_cdns_dsi_input(bridge); struct cdns_dsi *dsi =3D input_to_dsi(input); =20 if (WARN_ON(pm_runtime_get_sync(dsi->base.dev) < 0)) @@ -906,14 +916,17 @@ static void cdns_dsi_bridge_pre_enable(struct drm_bri= dge *bridge) } =20 static const struct drm_bridge_funcs cdns_dsi_bridge_funcs =3D { .attach =3D cdns_dsi_bridge_attach, .mode_valid =3D cdns_dsi_bridge_mode_valid, - .disable =3D cdns_dsi_bridge_disable, - .pre_enable =3D cdns_dsi_bridge_pre_enable, - .enable =3D cdns_dsi_bridge_enable, - .post_disable =3D cdns_dsi_bridge_post_disable, + .atomic_disable =3D cdns_dsi_bridge_atomic_disable, + .atomic_pre_enable =3D cdns_dsi_bridge_atomic_pre_enable, + .atomic_enable =3D cdns_dsi_bridge_atomic_enable, + .atomic_post_disable =3D cdns_dsi_bridge_atomic_post_disable, + .atomic_reset =3D drm_atomic_helper_bridge_reset, + .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state =3D drm_atomic_helper_bridge_destroy_state, }; =20 static int cdns_dsi_attach(struct mipi_dsi_host *host, struct mipi_dsi_device *dev) { --=20 2.48.1 From nobody Sun Dec 14 13:53:06 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 7D995267B9A for ; Thu, 13 Mar 2025 12:00:49 +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=1741867249; cv=none; b=gAeZxwX0h6w9xE6iQmDguz1SqRFkQ7ReHPi6Ecn2FCPjhRjFNs6yXp3odcpvgNvpVC/optx9yrAOHe/aNhRK5rhLUNmto7z74sZ+dOhvag4/Sgdoje7NMTdeo/2NE5qEUm1J8YuSYFURtYYSM1Xfxjs3cwUYpcXa9fUi1WfVFcY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867249; c=relaxed/simple; bh=xslq81ieLAR0jhY4WYdedCthgDAt8uUrAzOcxRWwIkg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tk7kGXdcOtEK15L2r0K8MEsSUNEJKGxF48H55c8qvNmBLUNHrTQFB924dRSrGovFFfcPSJYwghJjB2q7gubsCCc34mf1er7YWsypjdJj19K3uVAeqUE0Erc+ZDGXm36ZPy+OCLV4Mfd5X1iPVYFXgw9VVUwfdA+rArWf8ElqmC0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ocl+nXhn; 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="Ocl+nXhn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A1A8C4CEEA; Thu, 13 Mar 2025 12:00:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741867249; bh=xslq81ieLAR0jhY4WYdedCthgDAt8uUrAzOcxRWwIkg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Ocl+nXhndslWR+Bmmp4lN2Scnnu3Vtl59vNNfHbjnHVz+LwWdgVPcB8ZsMMILQsGX fEGwOhnZSMcW/omuRt5d+mXW4aGr1zgrIDOxIUIHm7BMeZMpfO/Hw2MM0iKVtcYKZa pfJLyBBh2RCE68hIDo6QvCK2GTh5ACZXG/QlHHUTx9aikouC9nvR7fTceaWdWvDLJb zAsEHZZ7pgZ8guV3JQw1g6WE9l5SBpd0BOegX+4+cM/CVEB/uuUXqXEvsrAHome/B/ qCOGJR6P0leiDesgutWw4LXoeN768CzmWP1AaDTSHH5ttTXyhet4t/2l/Vcx/DFQY6 3bX/FBH5V0YOQ== From: Maxime Ripard Date: Thu, 13 Mar 2025 13:00:07 +0100 Subject: [PATCH v6 13/16] drm/bridge: tc358775: Switch to atomic commit 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: <20250313-bridge-connector-v6-13-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=4332; i=mripard@kernel.org; h=from:subject:message-id; bh=xslq81ieLAR0jhY4WYdedCthgDAt8uUrAzOcxRWwIkg=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOmXThzbmah7quRTy5dldjMEGPac3Xtn7+XpWrrb5JevV LrA6uel2lHKwiDGxSArpsgSI2y+JO7UrNedbHzzYOawMoEMYeDiFICJ5BcxMtzYMbNpxbOL3lkG jzeeaz5oladjff9dSh+bPgeb5tEdhu8YGR6FX7949JSvbjpzuIJn0J7G4v8X1tw+ILjkg8M8zlu LbbkA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D The tc358775 driver follows the drm_encoder->crtc pointer that is deprecated and shouldn't be used by atomic drivers. Fortunately, the atomic hooks provide the drm_atomic_state and we can access our current CRTC from that, going from the bridge to its encoder, to its connector, and to its CRTC. Let's convert this bridge driver to atomic so we can get rid of the drm_encoder->crtc dereference. Reviewed-by: Dmitry Baryshkov Signed-off-by: Maxime Ripard --- drivers/gpu/drm/bridge/tc358775.c | 42 ++++++++++++++++++-----------------= ---- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358775.c b/drivers/gpu/drm/bridge/tc3= 58775.c index 13cd48e77d2d3f8dd646078fb7de95c420f29f73..1b10e6ee1724ffb4bb8946f86d2= f18e53428381a 100644 --- a/drivers/gpu/drm/bridge/tc358775.c +++ b/drivers/gpu/drm/bridge/tc358775.c @@ -284,11 +284,12 @@ struct tc_data { static inline struct tc_data *bridge_to_tc(struct drm_bridge *b) { return container_of(b, struct tc_data, bridge); } =20 -static void tc_bridge_pre_enable(struct drm_bridge *bridge) +static void tc_bridge_atomic_pre_enable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { struct tc_data *tc =3D bridge_to_tc(bridge); struct device *dev =3D &tc->dsi->dev; int ret; =20 @@ -307,11 +308,12 @@ static void tc_bridge_pre_enable(struct drm_bridge *b= ridge) =20 gpiod_set_value(tc->reset_gpio, 0); usleep_range(10, 20); } =20 -static void tc_bridge_post_disable(struct drm_bridge *bridge) +static void tc_bridge_atomic_post_disable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { struct tc_data *tc =3D bridge_to_tc(bridge); struct device *dev =3D &tc->dsi->dev; int ret; =20 @@ -366,34 +368,25 @@ static void d2l_write(struct i2c_client *i2c, u16 add= r, u32 val) if (ret < 0) dev_err(&i2c->dev, "Error %d writing to subaddress 0x%x\n", ret, addr); } =20 -/* helper function to access bus_formats */ -static struct drm_connector *get_connector(struct drm_encoder *encoder) -{ - struct drm_device *dev =3D encoder->dev; - struct drm_connector *connector; - - list_for_each_entry(connector, &dev->mode_config.connector_list, head) - if (connector->encoder =3D=3D encoder) - return connector; - - return NULL; -} - -static void tc_bridge_enable(struct drm_bridge *bridge) +static void tc_bridge_atomic_enable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { struct tc_data *tc =3D bridge_to_tc(bridge); u32 hback_porch, hsync_len, hfront_porch, hactive, htime1, htime2; u32 vback_porch, vsync_len, vfront_porch, vactive, vtime1, vtime2; u32 val =3D 0; u16 dsiclk, clkdiv, byteclk, t1, t2, t3, vsdelay; - struct drm_display_mode *mode; - struct drm_connector *connector =3D get_connector(bridge->encoder); - - mode =3D &bridge->encoder->crtc->state->adjusted_mode; + struct drm_connector *connector =3D + drm_atomic_get_new_connector_for_encoder(state, bridge->encoder); + struct drm_connector_state *conn_state =3D + drm_atomic_get_new_connector_state(state, connector); + struct drm_crtc_state *crtc_state =3D + drm_atomic_get_new_crtc_state(state, conn_state->crtc); + struct drm_display_mode *mode =3D &crtc_state->adjusted_mode; =20 hback_porch =3D mode->htotal - mode->hsync_end; hsync_len =3D mode->hsync_end - mode->hsync_start; vback_porch =3D mode->vtotal - mode->vsync_end; vsync_len =3D mode->vsync_end - mode->vsync_start; @@ -599,14 +592,17 @@ static int tc_bridge_attach(struct drm_bridge *bridge, &tc->bridge, flags); } =20 static const struct drm_bridge_funcs tc_bridge_funcs =3D { .attach =3D tc_bridge_attach, - .pre_enable =3D tc_bridge_pre_enable, - .enable =3D tc_bridge_enable, + .atomic_pre_enable =3D tc_bridge_atomic_pre_enable, + .atomic_enable =3D tc_bridge_atomic_enable, .mode_valid =3D tc_mode_valid, - .post_disable =3D tc_bridge_post_disable, + .atomic_post_disable =3D tc_bridge_atomic_post_disable, + .atomic_reset =3D drm_atomic_helper_bridge_reset, + .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state =3D drm_atomic_helper_bridge_destroy_state, }; =20 static int tc_attach_host(struct tc_data *tc) { struct device *dev =3D &tc->i2c->dev; --=20 2.48.1 From nobody Sun Dec 14 13:53:06 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 187EF267F54 for ; Thu, 13 Mar 2025 12:00:52 +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=1741867252; cv=none; b=DOVA6uZ8IiMI/fGKjCAZ8kEtqxzSnCFaYVu2fXKhlVz74waoEseUE8n9O0+oJsgEpc1sRaE33koCaPFvKCYZHBqME7eCbt1CqHxJ/q8rMN7AEBLzhUpcVoWjVUPhjqX8lW3+OIEWU04QSPUA+8g11XK9KLZNvKf0Caj5d6ISaQY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867252; c=relaxed/simple; bh=KzJc5TiXnjvtl+zcWu9wp4j+B7/vu4hUfNVTpT0Z+HQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rJi19uibhzjyqyrZ71O4iE6zd+/aOyf9OaSJWyKo7pQACgCuUjOxqsPO0CwX+xnoZSIeWEmFRfJWlJZxAE/pHheQaISQ+jYMU5Vt5aPI+RoTYzyOaSaf1IDTuozV3IkAPLR3L1ITduEdDgfTjSmM0RZFmWFUrtimxtVDH6lJF88= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dySuTXn+; 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="dySuTXn+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95943C4CEDD; Thu, 13 Mar 2025 12:00:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741867251; bh=KzJc5TiXnjvtl+zcWu9wp4j+B7/vu4hUfNVTpT0Z+HQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=dySuTXn+o7bxUpXsfZBd31gkruJgZ50VLCoiiw+YS74b2sv44+UD8XF3OI9/zeF3N uZzo8XCvLTLeOOgJG2fbwsnHm5VjYfWzHj0z0mA3jdmIH6B8LFf7YGPPq25eyiJnXx C49qQ2Fh6krbnApov6adPmtni9pd1Lipj7xnoBqsxPM+hsasp48pUaF/OTghiE3C/d jIwdEcgvdZ1jSTaZlozeLUhi9tRrtF3rLboOuxNvMmQbJb1OgjE3nHJuyVBnS6CYzk 9ywIQcRGY+xBKE3L//AGf4MpglLbWZGKJe0ZLrmCQyv3QAc76xBXJJxAnfZi0xhRad gojcHUQ4ZXLYA== From: Maxime Ripard Date: Thu, 13 Mar 2025 13:00:08 +0100 Subject: [PATCH v6 14/16] drm/bridge: tc358768: Stop disabling when failing to 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: <20250313-bridge-connector-v6-14-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=2183; i=mripard@kernel.org; h=from:subject:message-id; bh=KzJc5TiXnjvtl+zcWu9wp4j+B7/vu4hUfNVTpT0Z+HQ=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOmXThxTVrn78U3o9PbJx/RltC44HroYWFg7OXN5wHv99 X2zftsadJSyMIhxMciKKbLECJsviTs163UnG988mDmsTCBDGLg4BWAiu1cxMvS+qj9/a/EkxXyn h4x2Z1VPZbzNfrmZK/1i82depW1zXc8wMhz9ta5tLp+c7MWI4nuL9b4fmqdQ8DFcVd1s5tf409w 83pwA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D The tc358768 bridge driver, if enabling it fails, tries to disable it. This is pretty uncommon in bridge drivers, and also stands in the way for further reworks. Worse, since pre_enable and enable aren't expected to fail, disable and post_disable might be called twice: once to handle the failure, and once to actually disable the bridge. Since post_disable uses regulators and clocks, this would lead to enable count imbalances. In order to prevent that imbalance, and to allow further reworks, let's drop the calls to disable and post_disable, but keep the warning to let users know about what's going on. Reviewed-by: Dmitry Baryshkov Signed-off-by: Maxime Ripard --- drivers/gpu/drm/bridge/tc358768.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358768.c b/drivers/gpu/drm/bridge/tc3= 58768.c index 6db18d1e8824dd7d387211d6d1e668645cf88bbe..6b65ba8aed86012bc0f464bd5ee= 44325dae677c6 100644 --- a/drivers/gpu/drm/bridge/tc358768.c +++ b/drivers/gpu/drm/bridge/tc358768.c @@ -1075,15 +1075,12 @@ static void tc358768_bridge_pre_enable(struct drm_b= ridge *bridge) val =3D TC358768_DSI_CONFW_MODE_CLR | TC358768_DSI_CONFW_ADDR_DSI_CONTROL; val |=3D TC358768_DSI_CONTROL_DIS_MODE; /* DSI mode */ tc358768_write(priv, TC358768_DSI_CONFW, val); =20 ret =3D tc358768_clear_error(priv); - if (ret) { + if (ret) dev_err(dev, "Bridge pre_enable failed: %d\n", ret); - tc358768_bridge_disable(bridge); - tc358768_bridge_post_disable(bridge); - } } =20 static void tc358768_bridge_enable(struct drm_bridge *bridge) { struct tc358768_priv *priv =3D bridge_to_tc358768(bridge); @@ -1099,15 +1096,12 @@ static void tc358768_bridge_enable(struct drm_bridg= e *bridge) =20 /* set PP_en */ tc358768_update_bits(priv, TC358768_CONFCTL, BIT(6), BIT(6)); =20 ret =3D tc358768_clear_error(priv); - if (ret) { + if (ret) dev_err(priv->dev, "Bridge enable failed: %d\n", ret); - tc358768_bridge_disable(bridge); - tc358768_bridge_post_disable(bridge); - } } =20 #define MAX_INPUT_SEL_FORMATS 1 =20 static u32 * --=20 2.48.1 From nobody Sun Dec 14 13:53:06 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 B8A04267393 for ; Thu, 13 Mar 2025 12:00:54 +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=1741867254; cv=none; b=tklEDfHnIa1154CxmppqQptr+yKTI2scgWcdzAbQleKfunx3FQMNO2mHemTI70NqgfZOFeRPjn75EH6ejbSBWDmkUwJ/RI8C7LVe+N3YFBe/CjZx2WvbZRw3HC5VikIRxxWUj5l/JoDJyPnUKujK9G0zc1Mh8Ls/87rNBMm2F6g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867254; c=relaxed/simple; bh=pLWjIY6WqePBrvjqbQ1+ak02eZ5uPMBYm5c60VLzABc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qaj8E/DNvgpcn6rFOC0nBhUao4I5wAzSJ93oICpzTBO9hw4v8MPEmra0h/Jfpk5GV5vsXNxtgZYgES8xb+kfAWRlI3u79YrvBsr/LRFnoBTzdoibZUILcx1/GwJIzhfgmfwLe0p5TfGaZHbZzNpw0Dyr/Ge4AlPIbfEW/FN3Ip4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GvqWcg2h; 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="GvqWcg2h" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44244C4CEDD; Thu, 13 Mar 2025 12:00:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741867254; bh=pLWjIY6WqePBrvjqbQ1+ak02eZ5uPMBYm5c60VLzABc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=GvqWcg2hqb4YJmxMkopriaWArpO3AAGwlQg4W0WsrU6Gu0XVuxaIE+AnyEXtSZInF Q3AjY2oRhzpeWZ5Ig5C6t8nnpmkHx4L9HBrfOvE9kvrq6m2enMTpVy6rAv0dz/ekF6 sSgNkezuKf+aNe+kbu9H24fIYD3dOLeZ3x1ZwyWMMiqoGTXHQuzh70gjbi0LFtF80g A7QGypj3kPMxhGAS0V2bdWLD1JXNRYbxYI2pfHFebuDVJllLBZz2iNsIglcZehTyt6 JQzl33ixrRu8mmvvtezkCHM9Fa9YKWRwEFtnR+Ueot+Uc0XJPrqJ+4LM7Jg2AVuctP XJM46CzgNuYLQ== From: Maxime Ripard Date: Thu, 13 Mar 2025 13:00:09 +0100 Subject: [PATCH v6 15/16] drm/bridge: tc358768: Convert to atomic helpers 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: <20250313-bridge-connector-v6-15-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=4765; i=mripard@kernel.org; h=from:subject:message-id; bh=pLWjIY6WqePBrvjqbQ1+ak02eZ5uPMBYm5c60VLzABc=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOmXThzv22R8gf983vdVUg55CSdPrjno5zepwNPV2XXVQ 9/2Z5qHOkpZGMS4GGTFFFlihM2XxJ2a9bqTjW8ezBxWJpAhDFycAjCR7AqGf6q7Ggv/yok1T203 f33AuzHJOyWcrbSyTN34+qG63FNPtjH8T1b0sfnPfr0ybs7SQobD6sZPTs8LWGzDu97vqu1yg0e zGAE= X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D The tc358768 driver follows the drm_encoder->crtc pointer that is deprecated and shouldn't be used by atomic drivers. Fortunately, the atomic hooks provide the drm_atomic_state and we can access our current CRTC from that, going from the bridge to its encoder, to its connector, and to its CRTC. Let's convert this bridge driver to atomic so we can get rid of the drm_encoder->crtc dereference. Reviewed-by: Dmitry Baryshkov Signed-off-by: Maxime Ripard --- drivers/gpu/drm/bridge/tc358768.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358768.c b/drivers/gpu/drm/bridge/tc3= 58768.c index 6b65ba8aed86012bc0f464bd5ee44325dae677c6..063f217a17b6cf32e9793b8a96a= 5ac6128584098 100644 --- a/drivers/gpu/drm/bridge/tc358768.c +++ b/drivers/gpu/drm/bridge/tc358768.c @@ -579,11 +579,12 @@ tc358768_bridge_mode_valid(struct drm_bridge *bridge, return MODE_CLOCK_RANGE; =20 return MODE_OK; } =20 -static void tc358768_bridge_disable(struct drm_bridge *bridge) +static void tc358768_bridge_atomic_disable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { struct tc358768_priv *priv =3D bridge_to_tc358768(bridge); int ret; =20 /* set FrmStop */ @@ -601,11 +602,12 @@ static void tc358768_bridge_disable(struct drm_bridge= *bridge) ret =3D tc358768_clear_error(priv); if (ret) dev_warn(priv->dev, "Software disable failed: %d\n", ret); } =20 -static void tc358768_bridge_post_disable(struct drm_bridge *bridge) +static void tc358768_bridge_atomic_post_disable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { struct tc358768_priv *priv =3D bridge_to_tc358768(bridge); =20 tc358768_hw_disable(priv); } @@ -681,17 +683,21 @@ static u32 tc358768_dsi_bytes_to_ns(struct tc358768_p= riv *priv, u32 val) u64 n =3D priv->dsiclk / 4 * priv->dsi_lanes; =20 return (u32)div_u64(m, n); } =20 -static void tc358768_bridge_pre_enable(struct drm_bridge *bridge) +static void tc358768_bridge_atomic_pre_enable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { struct tc358768_priv *priv =3D bridge_to_tc358768(bridge); struct mipi_dsi_device *dsi_dev =3D priv->output.dev; unsigned long mode_flags =3D dsi_dev->mode_flags; u32 val, val2, lptxcnt, hact, data_type; s32 raw_val; + struct drm_crtc_state *crtc_state; + struct drm_connector_state *conn_state; + struct drm_connector *connector; const struct drm_display_mode *mode; u32 hsbyteclk_ps, dsiclk_ps, ui_ps; u32 dsiclk, hsbyteclk; int ret, i; struct videomode vm; @@ -718,11 +724,14 @@ static void tc358768_bridge_pre_enable(struct drm_bri= dge *bridge) dev_err(dev, "Software reset failed: %d\n", ret); tc358768_hw_disable(priv); return; } =20 - mode =3D &bridge->encoder->crtc->state->adjusted_mode; + connector =3D drm_atomic_get_new_connector_for_encoder(state, bridge->enc= oder); + conn_state =3D drm_atomic_get_new_connector_state(state, connector); + crtc_state =3D drm_atomic_get_new_crtc_state(state, conn_state->crtc); + mode =3D &crtc_state->adjusted_mode; ret =3D tc358768_setup_pll(priv, mode); if (ret) { dev_err(dev, "PLL setup failed: %d\n", ret); tc358768_hw_disable(priv); return; @@ -1079,11 +1088,12 @@ static void tc358768_bridge_pre_enable(struct drm_b= ridge *bridge) ret =3D tc358768_clear_error(priv); if (ret) dev_err(dev, "Bridge pre_enable failed: %d\n", ret); } =20 -static void tc358768_bridge_enable(struct drm_bridge *bridge) +static void tc358768_bridge_atomic_enable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { struct tc358768_priv *priv =3D bridge_to_tc358768(bridge); int ret; =20 if (!priv->enabled) { @@ -1159,14 +1169,14 @@ static bool tc358768_mode_fixup(struct drm_bridge *= bridge, =20 static const struct drm_bridge_funcs tc358768_bridge_funcs =3D { .attach =3D tc358768_bridge_attach, .mode_valid =3D tc358768_bridge_mode_valid, .mode_fixup =3D tc358768_mode_fixup, - .pre_enable =3D tc358768_bridge_pre_enable, - .enable =3D tc358768_bridge_enable, - .disable =3D tc358768_bridge_disable, - .post_disable =3D tc358768_bridge_post_disable, + .atomic_pre_enable =3D tc358768_bridge_atomic_pre_enable, + .atomic_enable =3D tc358768_bridge_atomic_enable, + .atomic_disable =3D tc358768_bridge_atomic_disable, + .atomic_post_disable =3D tc358768_bridge_atomic_post_disable, =20 .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_bridge_destroy_state, .atomic_reset =3D drm_atomic_helper_bridge_reset, .atomic_get_input_bus_fmts =3D tc358768_atomic_get_input_bus_fmts, --=20 2.48.1 From nobody Sun Dec 14 13:53:06 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 63C4D267F76 for ; Thu, 13 Mar 2025 12:00:57 +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=1741867257; cv=none; b=dbkw4kLvrn6N9/jd2vL5PcfJ0wIWpoO15vovYNPlpCJanpkZbKsvp/NDYEj0cViAtakgHkr8ZvsZvgXYZxAgXFtS1QkI5+Wpziz3eAgjoEe1rYbAwblh3StZV6qaOGI+IPz0OIA52PHJM6z3YDXSVwh9j+IFSTNTuZPWYKx2qoU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867257; c=relaxed/simple; bh=atUu69wRsiDL2eOwFYjquYlB8EAdd7+DA+qcNypDzmQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bXAt/m6Ck4prI1Y6MBD+kA66zX0qeyqODbCBaCPuZMaSXBLMIYdp54t7bfXmByQBZkTfF0JBKQ4Anh7J61Y+KspBUW9ZUAJYAF4axDDSUMdY9U6ra0IJuSKjK1cgrcmRGa8D0g977aoHvFrqe6g8ACGFHLPSMIGaxE5duqD4rDs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hjhVdRqT; 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="hjhVdRqT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6304C4CEE5; Thu, 13 Mar 2025 12:00:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741867257; bh=atUu69wRsiDL2eOwFYjquYlB8EAdd7+DA+qcNypDzmQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=hjhVdRqTAoNjv3jEALdiDSm/4qgv0m0lsEGbnCwNj74QdzzAEDAmRXQ+13isNdWVF 46U9zifOogxjkHrsxS75HabcC0mNumzntjRPSm/2REM7Dn7APm0rW7W6yKROZRMtCH d2oid4xd0WaJux8oP/O3ScA7Z8on7OfqZEkuU8rkm15IulxdMmR7cKMahfidUSuaVy 3pwuqSOm0gA3RCYjWyj7bMQlotkOoEP+jNlNrw8wFZO3evO54gCKwiDs9wPvzp1E7e bWJDVKqOnMozcr/vOoad9JDo3u9k9B8e5zxC/Iu1eG/a1Oa7m2L9gJSPNmWlEHvyJH 1dCYZ6sCX1qxw== From: Maxime Ripard Date: Thu, 13 Mar 2025 13:00:10 +0100 Subject: [PATCH v6 16/16] drm/bridge: ti-sn65dsi86: Remove drm_encoder->crtc use 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: <20250313-bridge-connector-v6-16-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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=8854; i=mripard@kernel.org; h=from:subject:message-id; bh=atUu69wRsiDL2eOwFYjquYlB8EAdd7+DA+qcNypDzmQ=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOmXTpwIef8uUZex7PSWa51T1h5ic97TeTfog6LuxPCIW IlP5mUeHaUsDGJcDLJiiiwxwuZL4k7Net3JxjcPZg4rE8gQBi5OAZgINwvDH47MiYs9t/OFx237 MyfrPvctxai/h2oi8u1r0x5sNpO4c5vhf4rX28DtG7RbLoSsSSsT2OPrWrQivcSW5bzDt31n1j/ tYQAA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D The TI sn65dsi86 driver follows the drm_encoder->crtc pointer that is deprecated and shouldn't be used by atomic drivers. Fortunately, the atomic hooks provide the drm_atomic_state and we can access our current CRTC from that, going from the bridge to its encoder, to its connector, and to its CRTC. This bridge driver uses the atomic hooks already, but dereferences the drm_encoder->crtc pointer in functions that don't have access to it. Let's rework the driver to pass the state where needed, and remove the need for the drm_encoder->crtc dereference. Reviewed-by: Douglas Anderson Tested-by: Douglas Anderson Signed-off-by: Maxime Ripard --- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 55 ++++++++++++++++++++++++-------= ---- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge= /ti-sn65dsi86.c index 190929a41abd1d8d6619e27bb9391f75145ed64a..fd68ad2e27186c24cef20dd4ae2= 0decdd6da4a2e 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c @@ -241,15 +241,30 @@ static void ti_sn65dsi86_write_u16(struct ti_sn65dsi8= 6 *pdata, u8 buf[2] =3D { val & 0xff, val >> 8 }; =20 regmap_bulk_write(pdata->regmap, reg, buf, ARRAY_SIZE(buf)); } =20 -static u32 ti_sn_bridge_get_dsi_freq(struct ti_sn65dsi86 *pdata) +static struct drm_display_mode * +get_new_adjusted_display_mode(struct drm_bridge *bridge, + struct drm_atomic_state *state) +{ + struct drm_connector *connector =3D + drm_atomic_get_new_connector_for_encoder(state, bridge->encoder); + struct drm_connector_state *conn_state =3D + drm_atomic_get_new_connector_state(state, connector); + struct drm_crtc_state *crtc_state =3D + drm_atomic_get_new_crtc_state(state, conn_state->crtc); + + return &crtc_state->adjusted_mode; +} + +static u32 ti_sn_bridge_get_dsi_freq(struct ti_sn65dsi86 *pdata, + struct drm_atomic_state *state) { u32 bit_rate_khz, clk_freq_khz; struct drm_display_mode *mode =3D - &pdata->bridge.encoder->crtc->state->adjusted_mode; + get_new_adjusted_display_mode(&pdata->bridge, state); =20 bit_rate_khz =3D mode->clock * mipi_dsi_pixel_format_to_bpp(pdata->dsi->format); clk_freq_khz =3D bit_rate_khz / (pdata->dsi->lanes * 2); =20 @@ -272,11 +287,12 @@ static const u32 ti_sn_bridge_dsiclk_lut[] =3D { 416000000, 486000000, 460800000, }; =20 -static void ti_sn_bridge_set_refclk_freq(struct ti_sn65dsi86 *pdata) +static void ti_sn_bridge_set_refclk_freq(struct ti_sn65dsi86 *pdata, + struct drm_atomic_state *state) { int i; u32 refclk_rate; const u32 *refclk_lut; size_t refclk_lut_size; @@ -285,11 +301,11 @@ static void ti_sn_bridge_set_refclk_freq(struct ti_sn= 65dsi86 *pdata) refclk_rate =3D clk_get_rate(pdata->refclk); refclk_lut =3D ti_sn_bridge_refclk_lut; refclk_lut_size =3D ARRAY_SIZE(ti_sn_bridge_refclk_lut); clk_prepare_enable(pdata->refclk); } else { - refclk_rate =3D ti_sn_bridge_get_dsi_freq(pdata) * 1000; + refclk_rate =3D ti_sn_bridge_get_dsi_freq(pdata, state) * 1000; refclk_lut =3D ti_sn_bridge_dsiclk_lut; refclk_lut_size =3D ARRAY_SIZE(ti_sn_bridge_dsiclk_lut); } =20 /* for i equals to refclk_lut_size means default frequency */ @@ -309,16 +325,17 @@ static void ti_sn_bridge_set_refclk_freq(struct ti_sn= 65dsi86 *pdata) * regardless of its actual sourcing. */ pdata->pwm_refclk_freq =3D ti_sn_bridge_refclk_lut[i]; } =20 -static void ti_sn65dsi86_enable_comms(struct ti_sn65dsi86 *pdata) +static void ti_sn65dsi86_enable_comms(struct ti_sn65dsi86 *pdata, + struct drm_atomic_state *state) { mutex_lock(&pdata->comms_mutex); =20 /* configure bridge ref_clk */ - ti_sn_bridge_set_refclk_freq(pdata); + ti_sn_bridge_set_refclk_freq(pdata, state); =20 /* * HPD on this bridge chip is a bit useless. This is an eDP bridge * so the HPD is an internal signal that's only there to signal that * the panel is done powering up. ...but the bridge chip debounces @@ -374,11 +391,11 @@ static int __maybe_unused ti_sn65dsi86_resume(struct = device *dev) * so we can do it in resume which lets us read the EDID before * pre_enable(). Without a reference clock we need the MIPI reference * clock so reading early doesn't work. */ if (pdata->refclk) - ti_sn65dsi86_enable_comms(pdata); + ti_sn65dsi86_enable_comms(pdata, NULL); =20 return ret; } =20 static int __maybe_unused ti_sn65dsi86_suspend(struct device *dev) @@ -820,16 +837,17 @@ static void ti_sn_bridge_atomic_disable(struct drm_br= idge *bridge, =20 /* disable video stream */ regmap_update_bits(pdata->regmap, SN_ENH_FRAME_REG, VSTREAM_ENABLE, 0); } =20 -static void ti_sn_bridge_set_dsi_rate(struct ti_sn65dsi86 *pdata) +static void ti_sn_bridge_set_dsi_rate(struct ti_sn65dsi86 *pdata, + struct drm_atomic_state *state) { unsigned int bit_rate_mhz, clk_freq_mhz; unsigned int val; struct drm_display_mode *mode =3D - &pdata->bridge.encoder->crtc->state->adjusted_mode; + get_new_adjusted_display_mode(&pdata->bridge, state); =20 /* set DSIA clk frequency */ bit_rate_mhz =3D (mode->clock / 1000) * mipi_dsi_pixel_format_to_bpp(pdata->dsi->format); clk_freq_mhz =3D bit_rate_mhz / (pdata->dsi->lanes * 2); @@ -855,16 +873,18 @@ static unsigned int ti_sn_bridge_get_bpp(struct drm_c= onnector *connector) */ static const unsigned int ti_sn_bridge_dp_rate_lut[] =3D { 0, 1620, 2160, 2430, 2700, 3240, 4320, 5400 }; =20 -static int ti_sn_bridge_calc_min_dp_rate_idx(struct ti_sn65dsi86 *pdata, u= nsigned int bpp) +static int ti_sn_bridge_calc_min_dp_rate_idx(struct ti_sn65dsi86 *pdata, + struct drm_atomic_state *state, + unsigned int bpp) { unsigned int bit_rate_khz, dp_rate_mhz; unsigned int i; struct drm_display_mode *mode =3D - &pdata->bridge.encoder->crtc->state->adjusted_mode; + get_new_adjusted_display_mode(&pdata->bridge, state); =20 /* Calculate minimum bit rate based on our pixel clock. */ bit_rate_khz =3D mode->clock * bpp; =20 /* Calculate minimum DP data rate, taking 80% as per DP spec */ @@ -959,14 +979,15 @@ static unsigned int ti_sn_bridge_read_valid_rates(str= uct ti_sn65dsi86 *pdata) } =20 return valid_rates; } =20 -static void ti_sn_bridge_set_video_timings(struct ti_sn65dsi86 *pdata) +static void ti_sn_bridge_set_video_timings(struct ti_sn65dsi86 *pdata, + struct drm_atomic_state *state) { struct drm_display_mode *mode =3D - &pdata->bridge.encoder->crtc->state->adjusted_mode; + get_new_adjusted_display_mode(&pdata->bridge, state); u8 hsync_polarity =3D 0, vsync_polarity =3D 0; =20 if (mode->flags & DRM_MODE_FLAG_NHSYNC) hsync_polarity =3D CHA_HSYNC_POLARITY; if (mode->flags & DRM_MODE_FLAG_NVSYNC) @@ -1104,11 +1125,11 @@ static void ti_sn_bridge_atomic_enable(struct drm_b= ridge *bridge, regmap_write(pdata->regmap, SN_LN_ASSIGN_REG, pdata->ln_assign); regmap_update_bits(pdata->regmap, SN_ENH_FRAME_REG, LN_POLRS_MASK, pdata->ln_polrs << LN_POLRS_OFFSET); =20 /* set dsi clk frequency value */ - ti_sn_bridge_set_dsi_rate(pdata); + ti_sn_bridge_set_dsi_rate(pdata, state); =20 /* * The SN65DSI86 only supports ASSR Display Authentication method and * this method is enabled for eDP panels. An eDP panel must support this * authentication method. We need to enable this method in the eDP panel @@ -1139,11 +1160,11 @@ static void ti_sn_bridge_atomic_enable(struct drm_b= ridge *bridge, val); =20 valid_rates =3D ti_sn_bridge_read_valid_rates(pdata); =20 /* Train until we run out of rates */ - for (dp_rate_idx =3D ti_sn_bridge_calc_min_dp_rate_idx(pdata, bpp); + for (dp_rate_idx =3D ti_sn_bridge_calc_min_dp_rate_idx(pdata, state, bpp); dp_rate_idx < ARRAY_SIZE(ti_sn_bridge_dp_rate_lut); dp_rate_idx++) { if (!(valid_rates & BIT(dp_rate_idx))) continue; =20 @@ -1155,11 +1176,11 @@ static void ti_sn_bridge_atomic_enable(struct drm_b= ridge *bridge, DRM_DEV_ERROR(pdata->dev, "%s (%d)\n", last_err_str, ret); return; } =20 /* config video parameters */ - ti_sn_bridge_set_video_timings(pdata); + ti_sn_bridge_set_video_timings(pdata, state); =20 /* enable video stream */ regmap_update_bits(pdata->regmap, SN_ENH_FRAME_REG, VSTREAM_ENABLE, VSTREAM_ENABLE); } @@ -1170,11 +1191,11 @@ static void ti_sn_bridge_atomic_pre_enable(struct d= rm_bridge *bridge, struct ti_sn65dsi86 *pdata =3D bridge_to_ti_sn65dsi86(bridge); =20 pm_runtime_get_sync(pdata->dev); =20 if (!pdata->refclk) - ti_sn65dsi86_enable_comms(pdata); + ti_sn65dsi86_enable_comms(pdata, state); =20 /* td7: min 100 us after enable before DSI data */ usleep_range(100, 110); } =20 --=20 2.48.1