From: Thierry Escande <thierry.escande@collabora.com>
To: Rob Herring <robh+dt@kernel.org>,
Archit Taneja <architt@codeaurora.org>,
Daniel Vetter <daniel.vetter@intel.com>,
Neil Armstrong <narmstrong@baylibre.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Sandy Huang <hjc@rock-chips.com>
Cc: Jeffy Chen <jeffy.chen@rock-chips.com>,
Sean Paul <seanpaul@chromium.org>,
dri-devel@lists.freedesktop.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH v8 4/8] drm/rockchip: dw-mipi-dsi: Fix error handling path
Date: Wed, 10 Jan 2018 17:23:44 +0100 [thread overview]
Message-ID: <20180110162348.22765-5-thierry.escande@collabora.com> (raw)
In-Reply-To: <20180110162348.22765-1-thierry.escande@collabora.com>
From: Jeffy Chen <jeffy.chen@rock-chips.com>
Add missing pm_runtime_disable() in bind()'s error handling path.
Also cleanup encoder & connector in unbind().
Fixes: 80a9a059d4e4 ("drm/rockchip/dsi: add dw-mipi power domain support")
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
---
drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
index b1fe0639227e..78e6b7919bf7 100644
--- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
+++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
@@ -1282,7 +1282,7 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master,
ret = dw_mipi_dsi_register(drm, dsi);
if (ret) {
DRM_DEV_ERROR(dev, "Failed to register mipi_dsi: %d\n", ret);
- goto err_pllref;
+ goto err_disable_pllref;
}
dsi->dsi_host.ops = &dw_mipi_dsi_host_ops;
@@ -1290,24 +1290,25 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master,
ret = mipi_dsi_host_register(&dsi->dsi_host);
if (ret) {
DRM_DEV_ERROR(dev, "Failed to register MIPI host: %d\n", ret);
- goto err_cleanup;
+ goto err_disable_pm_runtime;
}
if (!dsi->panel) {
ret = -EPROBE_DEFER;
- goto err_mipi_dsi_host;
+ goto err_unreg_mipi_dsi_host;
}
dev_set_drvdata(dev, dsi);
pm_runtime_enable(dev);
return 0;
-err_mipi_dsi_host:
+err_unreg_mipi_dsi_host:
mipi_dsi_host_unregister(&dsi->dsi_host);
-err_cleanup:
- drm_encoder_cleanup(&dsi->encoder);
- drm_connector_cleanup(&dsi->connector);
-err_pllref:
+err_disable_pm_runtime:
+ pm_runtime_disable(dev);
+ dsi->connector.funcs->destroy(&dsi->connector);
+ dsi->encoder.funcs->destroy(&dsi->encoder);
+err_disable_pllref:
clk_disable_unprepare(dsi->pllref_clk);
return ret;
}
@@ -1319,6 +1320,10 @@ static void dw_mipi_dsi_unbind(struct device *dev, struct device *master,
mipi_dsi_host_unregister(&dsi->dsi_host);
pm_runtime_disable(dev);
+
+ dsi->connector.funcs->destroy(&dsi->connector);
+ dsi->encoder.funcs->destroy(&dsi->encoder);
+
clk_disable_unprepare(dsi->pllref_clk);
}
--
2.14.1
next prev parent reply other threads:[~2018-01-10 16:25 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-10 16:23 [PATCH v8 0/8] rockchip: kevin: Enable edp display Thierry Escande
2018-01-10 16:23 ` [PATCH v8 1/8] drm/bridge: analogix: Do not use device's drvdata Thierry Escande
2018-03-01 15:39 ` Heiko Stübner
2018-01-10 16:23 ` [PATCH v8 2/8] drm/bridge: analogix_dp: Fix connector and encoder cleanup Thierry Escande
2018-03-01 15:39 ` Heiko Stübner
2018-01-10 16:23 ` [PATCH v8 3/8] drm/rockchip: analogix_dp: Add a sanity check for rockchip_drm_psr_register() Thierry Escande
2018-03-01 15:25 ` [PATCH] drm/rockchip: analogix_dp: reorder psr_unregister call in unbind Heiko Stuebner
2018-03-01 15:41 ` [PATCH v8 3/8] drm/rockchip: analogix_dp: Add a sanity check for rockchip_drm_psr_register() Heiko Stübner
2018-01-10 16:23 ` Thierry Escande [this message]
2018-03-01 15:50 ` [PATCH v8 4/8] drm/rockchip: dw-mipi-dsi: Fix error handling path Heiko Stübner
2018-03-02 12:09 ` Enric Balletbo i Serra
2018-03-02 12:17 ` Heiko Stuebner
2018-03-02 12:22 ` Enric Balletbo i Serra
2018-01-10 16:23 ` [PATCH v8 5/8] drm/rockchip: inno_hdmi: " Thierry Escande
2018-01-10 16:23 ` [PATCH v8 6/8] drm/bridge/synopsys: dw-hdmi: Add missing bridge detach Thierry Escande
2018-01-10 16:23 ` [PATCH v8 7/8] drm/bridge/synopsys: dw-hdmi: Do not use device's drvdata Thierry Escande
2018-03-01 15:45 ` Heiko Stübner
2018-01-10 16:23 ` [PATCH v8 8/8] drm/rockchip: dw_hdmi: Fix error handling path Thierry Escande
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=20180110162348.22765-5-thierry.escande@collabora.com \
--to=thierry.escande@collabora.com \
--cc=architt@codeaurora.org \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hjc@rock-chips.com \
--cc=jeffy.chen@rock-chips.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=narmstrong@baylibre.com \
--cc=robh+dt@kernel.org \
--cc=seanpaul@chromium.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).