[v2,2/5] drm/imx: dw_hdmi: Call drm_encoder_cleanup() in error path
diff mbox

Message ID 1457388054-23077-2-git-send-email-dianders@chromium.org
State New
Headers show

Commit Message

Doug Anderson March 7, 2016, 10 p.m. UTC
The drm_encoder_cleanup() was missing both from the error path of
dw_hdmi_imx_bind().  This caused a crash when slub_debug was
enabled and we ended up deferring probe of HDMI at boot.

This call isn't needed from unbind() because if dw_hdmi_bind() returns
no error then it takes over the job of freeing the encoder (in
dw_hdmi_unbind).

Signed-off-by: Douglas Anderson <dianders@chromium.org>
---
Changes in v2:
- IMX patch new in v2

 drivers/gpu/drm/imx/dw_hdmi-imx.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Comments

Doug Anderson March 28, 2016, 3:14 p.m. UTC | #1
Hi,

On Mon, Mar 7, 2016 at 2:00 PM, Douglas Anderson <dianders@chromium.org> wrote:
> The drm_encoder_cleanup() was missing both from the error path of
> dw_hdmi_imx_bind().  This caused a crash when slub_debug was
> enabled and we ended up deferring probe of HDMI at boot.
>
> This call isn't needed from unbind() because if dw_hdmi_bind() returns
> no error then it takes over the job of freeing the encoder (in
> dw_hdmi_unbind).
>
> Signed-off-by: Douglas Anderson <dianders@chromium.org>
> ---
> Changes in v2:
> - IMX patch new in v2
>
>  drivers/gpu/drm/imx/dw_hdmi-imx.c | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)

Mark picked up:

  [PATCH v2 1/5] drm/rockchip: dw_hdmi: Call drm_encoder_cleanup() in error path
  [PATCH v2 3/5] drm/rockchip: vop: Fix vop crtc cleanup
  [PATCH v2 4/5] drm/rockchip: dw_hdmi: Don't call platform_set_drvdata()

...for Rockchip, as you can see at
<https://patchwork.kernel.org/patch/8523301/>.

Does someone want to pick up:
  [PATCH v2 2/5] drm/imx: dw_hdmi: Call drm_encoder_cleanup() in error path
  [PATCH v2 5/5] drm/imx: dw_hdmi: Don't call platform_set_drvdata()

Thanks!

-Doug
Philipp Zabel March 30, 2016, 1:35 p.m. UTC | #2
Hi Doug,

Am Montag, den 28.03.2016, 08:14 -0700 schrieb Doug Anderson:
> Hi,
> 
> On Mon, Mar 7, 2016 at 2:00 PM, Douglas Anderson <dianders@chromium.org> wrote:
> > The drm_encoder_cleanup() was missing both from the error path of
> > dw_hdmi_imx_bind().  This caused a crash when slub_debug was
> > enabled and we ended up deferring probe of HDMI at boot.
> >
> > This call isn't needed from unbind() because if dw_hdmi_bind() returns
> > no error then it takes over the job of freeing the encoder (in
> > dw_hdmi_unbind).
> >
> > Signed-off-by: Douglas Anderson <dianders@chromium.org>
> > ---
> > Changes in v2:
> > - IMX patch new in v2
> >
> >  drivers/gpu/drm/imx/dw_hdmi-imx.c | 11 ++++++++++-
> >  1 file changed, 10 insertions(+), 1 deletion(-)
> 
> Mark picked up:
> 
>   [PATCH v2 1/5] drm/rockchip: dw_hdmi: Call drm_encoder_cleanup() in error path
>   [PATCH v2 3/5] drm/rockchip: vop: Fix vop crtc cleanup
>   [PATCH v2 4/5] drm/rockchip: dw_hdmi: Don't call platform_set_drvdata()
> 
> ...for Rockchip, as you can see at
> <https://patchwork.kernel.org/patch/8523301/>.
> 
> Does someone want to pick up:
>   [PATCH v2 2/5] drm/imx: dw_hdmi: Call drm_encoder_cleanup() in error path
>   [PATCH v2 5/5] drm/imx: dw_hdmi: Don't call platform_set_drvdata()
> 
> Thanks!

Thank you for the reminder, both patches applied.

regards
Philipp

Patch
diff mbox

diff --git a/drivers/gpu/drm/imx/dw_hdmi-imx.c b/drivers/gpu/drm/imx/dw_hdmi-imx.c
index 2a95d10e9d92..c69c3142819c 100644
--- a/drivers/gpu/drm/imx/dw_hdmi-imx.c
+++ b/drivers/gpu/drm/imx/dw_hdmi-imx.c
@@ -245,7 +245,16 @@  static int dw_hdmi_imx_bind(struct device *dev, struct device *master,
 	drm_encoder_init(drm, encoder, &dw_hdmi_imx_encoder_funcs,
 			 DRM_MODE_ENCODER_TMDS, NULL);
 
-	return dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data);
+	ret = dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data);
+
+	/*
+	 * If dw_hdmi_bind() fails we'll never call dw_hdmi_unbind(),
+	 * which would have called the encoder cleanup.  Do it manually.
+	 */
+	if (ret)
+		drm_encoder_cleanup(encoder);
+
+	return ret;
 }
 
 static void dw_hdmi_imx_unbind(struct device *dev, struct device *master,