From: Maxime Ripard <maxime@cerno.tech>
To: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Maxime Ripard <maxime@cerno.tech>,
Sam Ravnborg <sam@ravnborg.org>,
Daniel Vetter <daniel.vetter@intel.com>,
David Airlie <airlied@linux.ie>,
Thierry Reding <thierry.reding@gmail.com>,
Andrzej Hajda <a.hajda@samsung.com>,
Robert Foss <robert.foss@linaro.org>,
Neil Armstrong <narmstrong@baylibre.com>,
Jonas Karlman <jonas@kwiboo.se>,
Jernej Skrabec <jernej.skrabec@gmail.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>,
Xinliang Liu <xinliang.liu@linaro.org>,
linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org,
Tian Tao <tiantao6@hisilicon.com>,
freedreno@lists.freedesktop.org,
Chen Feng <puck.chen@hisilicon.com>,
Joonyoung Shim <jy0922.shim@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
John Stultz <john.stultz@linaro.org>,
Rob Clark <robdclark@gmail.com>,
linux-arm-msm@vger.kernel.org, Sean Paul <sean@poorly.run>,
Inki Dae <inki.dae@samsung.com>,
Xinwei Kong <kong.kongxinwei@hisilicon.com>,
dri-devel@lists.freedesktop.org
Subject: [PATCH v5 16/21] drm/bridge: sn65dsi86: Switch to devm MIPI-DSI helpers
Date: Thu, 21 Oct 2021 09:39:42 +0200 [thread overview]
Message-ID: <20211021073947.499373-17-maxime@cerno.tech> (raw)
In-Reply-To: <20211021073947.499373-1-maxime@cerno.tech>
Let's switch to the new devm MIPI-DSI function to register and attach
our secondary device. This also avoids leaking the device when we detach
the bridge.
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
index 6154bed0af5b..36a82e3d17ab 100644
--- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c
+++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
@@ -662,6 +662,7 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge,
struct ti_sn65dsi86 *pdata = bridge_to_ti_sn65dsi86(bridge);
struct mipi_dsi_host *host;
struct mipi_dsi_device *dsi;
+ struct device *dev = pdata->dev;
const struct mipi_dsi_device_info info = { .type = "ti_sn_bridge",
.channel = 0,
.node = NULL,
@@ -701,7 +702,7 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge,
goto err_dsi_host;
}
- dsi = mipi_dsi_device_register_full(host, &info);
+ dsi = devm_mipi_dsi_device_register_full(dev, host, &info);
if (IS_ERR(dsi)) {
DRM_ERROR("failed to create dsi device\n");
ret = PTR_ERR(dsi);
@@ -714,16 +715,16 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge,
dsi->mode_flags = MIPI_DSI_MODE_VIDEO;
/* check if continuous dsi clock is required or not */
- pm_runtime_get_sync(pdata->dev);
+ pm_runtime_get_sync(dev);
regmap_read(pdata->regmap, SN_DPPLL_SRC_REG, &val);
- pm_runtime_put_autosuspend(pdata->dev);
+ pm_runtime_put_autosuspend(dev);
if (!(val & DPPLL_CLK_SRC_DSICLK))
dsi->mode_flags |= MIPI_DSI_CLOCK_NON_CONTINUOUS;
- ret = mipi_dsi_attach(dsi);
+ ret = devm_mipi_dsi_attach(dev, dsi);
if (ret < 0) {
DRM_ERROR("failed to attach dsi to host\n");
- goto err_dsi_attach;
+ goto err_dsi_host;
}
pdata->dsi = dsi;
@@ -734,14 +735,10 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge,
ret = drm_bridge_attach(bridge->encoder, pdata->next_bridge,
&pdata->bridge, flags);
if (ret < 0)
- goto err_dsi_detach;
+ goto err_dsi_host;
return 0;
-err_dsi_detach:
- mipi_dsi_detach(dsi);
-err_dsi_attach:
- mipi_dsi_device_unregister(dsi);
err_dsi_host:
drm_connector_cleanup(&pdata->connector);
err_conn_init:
@@ -1237,11 +1234,6 @@ static void ti_sn_bridge_remove(struct auxiliary_device *adev)
if (!pdata)
return;
- if (pdata->dsi) {
- mipi_dsi_detach(pdata->dsi);
- mipi_dsi_device_unregister(pdata->dsi);
- }
-
drm_bridge_remove(&pdata->bridge);
of_node_put(pdata->host_node);
--
2.31.1
next prev parent reply other threads:[~2021-10-21 7:42 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-21 7:39 [PATCH v5 00/21] drm/bridge: Make panel and bridge probe order consistent Maxime Ripard
2021-10-21 7:39 ` [PATCH v5 01/21] drm/bridge: adv7533: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-10-21 7:39 ` [PATCH v5 02/21] drm/bridge: adv7511: Register and attach our DSI device at probe Maxime Ripard
2021-10-21 7:39 ` [PATCH v5 03/21] drm/bridge: anx7625: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-10-21 7:39 ` [PATCH v5 04/21] drm/bridge: anx7625: Register and attach our DSI device at probe Maxime Ripard
2021-10-21 7:39 ` [PATCH v5 05/21] drm/bridge: lt8912b: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-10-21 7:39 ` [PATCH v5 06/21] drm/bridge: lt8912b: Register and attach our DSI device at probe Maxime Ripard
2021-10-21 7:39 ` [PATCH v5 07/21] drm/bridge: lt9611: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-10-21 7:39 ` [PATCH v5 08/21] drm/bridge: lt9611: Register and attach our DSI device at probe Maxime Ripard
2021-10-21 7:39 ` [PATCH v5 09/21] drm/bridge: lt9611uxc: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-10-21 7:39 ` [PATCH v5 10/21] drm/bridge: lt9611uxc: Register and attach our DSI device at probe Maxime Ripard
2021-10-21 7:39 ` [PATCH v5 11/21] drm/bridge: ps8640: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-10-21 7:39 ` [PATCH v5 12/21] drm/bridge: ps8640: Register and attach our DSI device at probe Maxime Ripard
2021-10-21 7:39 ` [PATCH v5 13/21] drm/bridge: sn65dsi83: Fix bridge removal Maxime Ripard
2021-10-22 20:02 ` Marek Vasut
2021-10-21 7:39 ` [PATCH v5 14/21] drm/bridge: sn65dsi83: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-10-21 7:39 ` [PATCH v5 15/21] drm/bridge: sn65dsi83: Register and attach our DSI device at probe Maxime Ripard
2021-10-21 7:39 ` Maxime Ripard [this message]
2021-10-21 7:39 ` [PATCH v5 17/21] drm/bridge: sn65dsi86: " Maxime Ripard
2021-10-21 7:39 ` [PATCH v5 18/21] drm/bridge: tc358775: Switch to devm MIPI-DSI helpers Maxime Ripard
2021-10-21 7:39 ` [PATCH v5 19/21] drm/bridge: tc358775: Register and attach our DSI device at probe Maxime Ripard
2021-10-21 7:39 ` [PATCH v5 20/21] drm/kirin: dsi: Adjust probe order Maxime Ripard
2021-10-21 7:39 ` [PATCH v5 21/21] drm/msm/dsi: " Maxime Ripard
2021-10-21 16:30 ` Rob Clark
[not found] ` <YXGFz4o5fWrfGnGk@ravnborg.org>
2021-10-25 15:16 ` [PATCH v5 00/21] drm/bridge: Make panel and bridge probe order consistent Maxime Ripard
[not found] ` <YXbhSjsPXk944TlF@ravnborg.org>
2021-10-27 8:42 ` 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=20211021073947.499373-17-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).