[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <7002caef-7b73-763a-22eb-4a526cf854b9@codeaurora.org>
Date: Wed, 10 Jan 2018 14:44:40 +0530
From: Archit Taneja <architt@...eaurora.org>
To: Thierry Escande <thierry.escande@...labora.com>,
Rob Herring <robh+dt@...nel.org>,
Daniel Vetter <daniel.vetter@...el.com>,
Neil Armstrong <narmstrong@...libre.com>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Sandy Huang <hjc@...k-chips.com>
Cc: Jeffy Chen <jeffy.chen@...k-chips.com>,
Sean Paul <seanpaul@...omium.org>,
dri-devel@...ts.freedesktop.org,
linux-rockchip@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v7 6/8] drm/bridge/synopsys: dw-hdmi: Add missing bridge
detach
On 01/09/2018 08:18 PM, Thierry Escande wrote:
> From: Jeffy Chen <jeffy.chen@...k-chips.com>
>
> We inited connector in attach(), so need a detach() to cleanup.
>
> Also fix wrong use of dw_hdmi_remove() in bind().
>
> Signed-off-by: Jeffy Chen <jeffy.chen@...k-chips.com>
> Signed-off-by: Thierry Escande <thierry.escande@...labora.com>
Reviewed-by: Archit Taneja <architt@...eaurora.org>
> ---
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> index a38db40ce990..1cc63a18b7d5 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> @@ -1967,6 +1967,13 @@ static int dw_hdmi_bridge_attach(struct drm_bridge *bridge)
> return 0;
> }
>
> +static void dw_hdmi_bridge_detach(struct drm_bridge *bridge)
> +{
> + struct dw_hdmi *hdmi = bridge->driver_private;
> +
> + drm_connector_cleanup(&hdmi->connector);
> +}
> +
> static enum drm_mode_status
> dw_hdmi_bridge_mode_valid(struct drm_bridge *bridge,
> const struct drm_display_mode *mode)
> @@ -2023,6 +2030,7 @@ static void dw_hdmi_bridge_enable(struct drm_bridge *bridge)
>
> static const struct drm_bridge_funcs dw_hdmi_bridge_funcs = {
> .attach = dw_hdmi_bridge_attach,
> + .detach = dw_hdmi_bridge_detach,
> .enable = dw_hdmi_bridge_enable,
> .disable = dw_hdmi_bridge_disable,
> .mode_set = dw_hdmi_bridge_mode_set,
> @@ -2616,7 +2624,7 @@ int dw_hdmi_bind(struct platform_device *pdev, struct drm_encoder *encoder,
>
> ret = drm_bridge_attach(encoder, &hdmi->bridge, NULL);
> if (ret) {
> - dw_hdmi_remove(pdev);
> + __dw_hdmi_remove(hdmi);
> DRM_ERROR("Failed to initialize bridge with drm\n");
> return ret;
> }
>
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
Powered by blists - more mailing lists