From: Maxime Ripard <maxime@cerno.tech>
To: Thierry Reding <thierry.reding@gmail.com>,
Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
Andrzej Hajda <a.hajda@samsung.com>,
Robert Foss <robert.foss@linaro.org>,
Jonas Karlman <jonas@kwiboo.se>,
Daniel Vetter <daniel.vetter@intel.com>,
David Airlie <airlied@linux.ie>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Maxime Ripard <maxime@cerno.tech>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Sam Ravnborg <sam@ravnborg.org>,
Neil Armstrong <narmstrong@baylibre.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>,
linux-arm-msm@vger.kernel.org,
Joonyoung Shim <jy0922.shim@samsung.com>,
Rob Clark <robdclark@gmail.com>,
Tian Tao <tiantao6@hisilicon.com>,
Chen Feng <puck.chen@hisilicon.com>,
Xinwei Kong <kong.kongxinwei@hisilicon.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
linux-samsung-soc@vger.kernel.org,
Xinliang Liu <xinliang.liu@linaro.org>,
John Stultz <john.stultz@linaro.org>,
linux-kernel@vger.kernel.org, Inki Dae <inki.dae@samsung.com>,
dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org,
Sean Paul <sean@poorly.run>
Subject: [PATCH v6 10/21] drm/bridge: lt9611uxc: Register and attach our DSI device at probe
Date: Mon, 25 Oct 2021 17:15:25 +0200 [thread overview]
Message-ID: <20211025151536.1048186-11-maxime@cerno.tech> (raw)
In-Reply-To: <20211025151536.1048186-1-maxime@cerno.tech>
In order to avoid any probe ordering issue, the best practice is to move
the secondary MIPI-DSI device registration and attachment to the
MIPI-DSI host at probe time. Let's do this.
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 31 +++++++++++++---------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
index ab1a0c00aad8..33f9716da0ee 100644
--- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
+++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
@@ -367,18 +367,6 @@ static int lt9611uxc_bridge_attach(struct drm_bridge *bridge,
return ret;
}
- /* Attach primary DSI */
- lt9611uxc->dsi0 = lt9611uxc_attach_dsi(lt9611uxc, lt9611uxc->dsi0_node);
- if (IS_ERR(lt9611uxc->dsi0))
- return PTR_ERR(lt9611uxc->dsi0);
-
- /* Attach secondary DSI, if specified */
- if (lt9611uxc->dsi1_node) {
- lt9611uxc->dsi1 = lt9611uxc_attach_dsi(lt9611uxc, lt9611uxc->dsi1_node);
- if (IS_ERR(lt9611uxc->dsi1))
- return PTR_ERR(lt9611uxc->dsi1);
- }
-
return 0;
}
@@ -958,8 +946,27 @@ static int lt9611uxc_probe(struct i2c_client *client,
drm_bridge_add(<9611uxc->bridge);
+ /* Attach primary DSI */
+ lt9611uxc->dsi0 = lt9611uxc_attach_dsi(lt9611uxc, lt9611uxc->dsi0_node);
+ if (IS_ERR(lt9611uxc->dsi0)) {
+ ret = PTR_ERR(lt9611uxc->dsi0);
+ goto err_remove_bridge;
+ }
+
+ /* Attach secondary DSI, if specified */
+ if (lt9611uxc->dsi1_node) {
+ lt9611uxc->dsi1 = lt9611uxc_attach_dsi(lt9611uxc, lt9611uxc->dsi1_node);
+ if (IS_ERR(lt9611uxc->dsi1)) {
+ ret = PTR_ERR(lt9611uxc->dsi1);
+ goto err_remove_bridge;
+ }
+ }
+
return lt9611uxc_audio_init(dev, lt9611uxc);
+err_remove_bridge:
+ drm_bridge_remove(<9611uxc->bridge);
+
err_disable_regulators:
regulator_bulk_disable(ARRAY_SIZE(lt9611uxc->supplies), lt9611uxc->supplies);
--
2.31.1
next prev parent reply other threads:[~2021-10-25 15:16 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-25 15:15 [PATCH v6 00/21] drm/bridge: Make panel and bridge probe order consistent Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 01/21] drm/bridge: adv7533: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 02/21] drm/bridge: adv7511: Register and attach our DSI device at probe Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
[not found] ` <CGME20211029062347eucas1p1431402205321b066349e3ccf432d2452@eucas1p1.samsung.com>
2021-10-29 6:23 ` [v6,02/21] " Marek Szyprowski
2021-10-29 8:05 ` Maxime Ripard
2021-10-29 8:36 ` Marek Szyprowski
2021-10-29 8:46 ` Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 03/21] drm/bridge: anx7625: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 04/21] drm/bridge: anx7625: Register and attach our DSI device at probe Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 05/21] drm/bridge: lt8912b: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 06/21] drm/bridge: lt8912b: Register and attach our DSI device at probe Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 07/21] drm/bridge: lt9611: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 08/21] drm/bridge: lt9611: Register and attach our DSI device at probe Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 09/21] drm/bridge: lt9611uxc: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
2021-10-25 15:15 ` Maxime Ripard [this message]
2021-10-27 20:09 ` (subset) [PATCH v6 10/21] drm/bridge: lt9611uxc: Register and attach our DSI device at probe Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 11/21] drm/bridge: ps8640: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 12/21] drm/bridge: ps8640: Register and attach our DSI device at probe Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 13/21] drm/bridge: sn65dsi83: Fix bridge removal Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 14/21] drm/bridge: sn65dsi83: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 15/21] drm/bridge: sn65dsi83: Register and attach our DSI device at probe Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 16/21] drm/bridge: sn65dsi86: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 17/21] drm/bridge: sn65dsi86: Register and attach our DSI device at probe Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 18/21] drm/bridge: tc358775: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 19/21] drm/bridge: tc358775: Register and attach our DSI device at probe Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 20/21] drm/kirin: dsi: Adjust probe order Maxime Ripard
2021-10-27 18:34 ` John Stultz
2021-10-27 20:09 ` (subset) " Maxime Ripard
2021-10-25 15:15 ` [PATCH v6 21/21] drm/msm/dsi: " Maxime Ripard
2021-10-27 20:09 ` (subset) " Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211025151536.1048186-11-maxime@cerno.tech \
--to=maxime@cerno.tech \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=a.hajda@samsung.com \
--cc=airlied@linux.ie \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=inki.dae@samsung.com \
--cc=jernej.skrabec@gmail.com \
--cc=john.stultz@linaro.org \
--cc=jonas@kwiboo.se \
--cc=jy0922.shim@samsung.com \
--cc=kong.kongxinwei@hisilicon.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=narmstrong@baylibre.com \
--cc=puck.chen@hisilicon.com \
--cc=robdclark@gmail.com \
--cc=robert.foss@linaro.org \
--cc=sam@ravnborg.org \
--cc=sean@poorly.run \
--cc=sw0312.kim@samsung.com \
--cc=thierry.reding@gmail.com \
--cc=tiantao6@hisilicon.com \
--cc=tzimmermann@suse.de \
--cc=xinliang.liu@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).