Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1741980

[PATCH v3 05/14] drm/sun4i: hdmi: Disable clks in bind function error path and unbind function

Show all headers | View raw

The HDMI driver enables the bus and mod clocks in the bind function, but
does not disable them if it then bails our due to any errors. Neither
does it disable the clocks in the unbind function.

Fix this by adding a proper error path to the bind function, and
clk_disable_unprepare calls to the unbind function.

Also rename the err_cleanup_connector label to err_cleanup_encoder,
since it is the encoder that gets cleaned up.

Fixes: 9c5681011a0c ("drm/sun4i: Add HDMI support")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
index 9ea6cd5a1370..3cf1a6932fac 100644
--- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
@@ -302,26 +302,29 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master,
 	hdmi->mod_clk = devm_clk_get(dev, "mod");
 	if (IS_ERR(hdmi->mod_clk)) {
 		dev_err(dev, "Couldn't get the HDMI mod clock\n");
-		return PTR_ERR(hdmi->mod_clk);
+		ret = PTR_ERR(hdmi->mod_clk);
+		goto err_disable_bus_clk;
 	}
 	clk_prepare_enable(hdmi->mod_clk);
 
 	hdmi->pll0_clk = devm_clk_get(dev, "pll-0");
 	if (IS_ERR(hdmi->pll0_clk)) {
 		dev_err(dev, "Couldn't get the HDMI PLL 0 clock\n");
-		return PTR_ERR(hdmi->pll0_clk);
+		ret = PTR_ERR(hdmi->pll0_clk);
+		goto err_disable_mod_clk;
 	}
 
 	hdmi->pll1_clk = devm_clk_get(dev, "pll-1");
 	if (IS_ERR(hdmi->pll1_clk)) {
 		dev_err(dev, "Couldn't get the HDMI PLL 1 clock\n");
-		return PTR_ERR(hdmi->pll1_clk);
+		ret = PTR_ERR(hdmi->pll1_clk);
+		goto err_disable_mod_clk;
 	}
 
 	ret = sun4i_tmds_create(hdmi);
 	if (ret) {
 		dev_err(dev, "Couldn't create the TMDS clock\n");
-		return ret;
+		goto err_disable_mod_clk;
 	}
 
 	writel(SUN4I_HDMI_CTRL_ENABLE, hdmi->base + SUN4I_HDMI_CTRL_REG);
@@ -362,7 +365,7 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master,
 	ret = sun4i_hdmi_i2c_create(dev, hdmi);
 	if (ret) {
 		dev_err(dev, "Couldn't create the HDMI I2C adapter\n");
-		return ret;
+		goto err_disable_mod_clk;
 	}
 
 	drm_encoder_helper_add(&hdmi->encoder,
@@ -422,6 +425,10 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master,
 	drm_encoder_cleanup(&hdmi->encoder);
 err_del_i2c_adapter:
 	i2c_del_adapter(hdmi->i2c);
+err_disable_mod_clk:
+	clk_disable_unprepare(hdmi->mod_clk);
+err_disable_bus_clk:
+	clk_disable_unprepare(hdmi->bus_clk);
 	return ret;
 }
 
@@ -434,6 +441,8 @@ static void sun4i_hdmi_unbind(struct device *dev, struct device *master,
 	drm_connector_cleanup(&hdmi->connector);
 	drm_encoder_cleanup(&hdmi->encoder);
 	i2c_del_adapter(hdmi->i2c);
+	clk_disable_unprepare(hdmi->mod_clk);
+	clk_disable_unprepare(hdmi->bus_clk);
 }
 
 static const struct component_ops sun4i_hdmi_ops = {
-- 
2.14.2

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 00/14] drm/sun4i: hdmi: Support HDMI controller on A31 Chen-Yu Tsai <wens@csie.org> - 2017-09-29 10:30 +0200
  [PATCH v3 11/14] drm/sun4i: hdmi: Add A31 specific DDC register definitions Chen-Yu Tsai <wens@csie.org> - 2017-09-29 10:30 +0200
  [PATCH v3 06/14] drm/sun4i: hdmi: create a regmap for later use Chen-Yu Tsai <wens@csie.org> - 2017-09-29 10:30 +0200
  [PATCH v3 10/14] drm/sun4i: hdmi: Add support for controller hardware variants Chen-Yu Tsai <wens@csie.org> - 2017-09-29 10:30 +0200
  [PATCH v3 07/14] drm/sun4i: hdmi: Allow using second PLL as TMDS clk parent Chen-Yu Tsai <wens@csie.org> - 2017-09-29 10:30 +0200
  [PATCH v3 05/14] drm/sun4i: hdmi: Disable clks in bind function error path and unbind function Chen-Yu Tsai <wens@csie.org> - 2017-09-29 10:30 +0200
  [PATCH v3 03/14] drm/sun4i: tcon: Add variant callback for TCON output muxing Chen-Yu Tsai <wens@csie.org> - 2017-09-29 10:30 +0200
    Re: [PATCH v3 03/14] drm/sun4i: tcon: Add variant callback for TCON  output muxing Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-09-29 12:20 +0200
      Re: [PATCH v3 03/14] drm/sun4i: tcon: Add variant callback for TCON  output muxing Chen-Yu Tsai <wens@csie.org> - 2017-10-02 15:10 +0200
  [PATCH v3 14/14] ARM: dts: sun6i: Enable HDMI support on some A31/A31s devices Chen-Yu Tsai <wens@csie.org> - 2017-09-29 10:30 +0200
  [PATCH v3 04/14] drm/sun4i: tcon: Add support for demuxing TCON output on A31 Chen-Yu Tsai <wens@csie.org> - 2017-09-29 10:30 +0200
    Re: [PATCH v3 04/14] drm/sun4i: tcon: Add support for demuxing TCON  output on A31 Chen-Yu Tsai <wens@csie.org> - 2017-09-29 12:30 +0200
      Re: [linux-sunxi] Re: [PATCH v3 04/14] drm/sun4i: tcon: Add support  for demuxing TCON output on A31 Julian Calaby <julian.calaby@gmail.com> - 2017-09-30 07:40 +0200
        Re: [linux-sunxi] Re: [PATCH v3 04/14] drm/sun4i: tcon: Add support  for demuxing TCON output on A31 Chen-Yu Tsai <wens@csie.org> - 2017-09-30 08:00 +0200
          Re: [linux-sunxi] Re: [PATCH v3 04/14] drm/sun4i: tcon: Add support  for demuxing TCON output on A31 Julian Calaby <julian.calaby@gmail.com> - 2017-09-30 08:30 +0200
            Re: [linux-sunxi] Re: [PATCH v3 04/14] drm/sun4i: tcon: Add support  for demuxing TCON output on A31 Chen-Yu Tsai <wens@csie.org> - 2017-10-02 09:20 +0200
    Re: [PATCH v3 04/14] drm/sun4i: tcon: Add support for demuxing TCON  output on A31 Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-09-29 12:30 +0200

csiph-web