drm/bridge: analogix_dp: Fix connector and encoder cleanup

Since we are initing connector in the core driver and encoder in the
plat driver, let's clean them up in the right places.

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20180110162348.22765-3-thierry.escande@collabora.com

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 5940dc4eac6cb67d9a1b8c860f1ada11766481bf..3f7a796b27e4a483ba8b9e4438138cf29524564d 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1407,7 +1407,6 @@ analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,
        ret = analogix_dp_create_bridge(drm_dev, dp);
        if (ret) {
                DRM_ERROR("failed to create bridge (%d)\n", ret);
-               drm_encoder_cleanup(dp->encoder);
                goto err_disable_pm_runtime;
        }
 
@@ -1430,7 +1429,6 @@ void analogix_dp_unbind(struct analogix_dp_device *dp)
 {
        analogix_dp_bridge_disable(dp->bridge);
        dp->connector.funcs->destroy(&dp->connector);
-       dp->encoder->funcs->destroy(dp->encoder);
 
        if (dp->plat_data->panel) {
                if (drm_panel_unprepare(dp->plat_data->panel))

diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c
index f7e5b2c405ed60f08bd6088b9065f4b39546639a..33319a858f3ab537a833cb7c42058d10e64376c3 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_dp.c
+++ b/drivers/gpu/drm/exynos/exynos_dp.c
@@ -185,8 +185,10 @@ static int exynos_dp_bind(struct device *dev, struct device *master, void *data)
        dp->plat_data.encoder = encoder;
 
        dp->adp = analogix_dp_bind(dev, dp->drm_dev, &dp->plat_data);
-       if (IS_ERR(dp->adp))
+       if (IS_ERR(dp->adp)) {
+               dp->encoder.funcs->destroy(&dp->encoder);
                return PTR_ERR(dp->adp);
+       }
 
        return 0;
 }
@@ -196,7 +198,8 @@ static void exynos_dp_unbind(struct device *dev, struct device *master,
 {
        struct exynos_dp_device *dp = dev_get_drvdata(dev);
 
-       return analogix_dp_unbind(dp->adp);
+       analogix_dp_unbind(dp->adp);
+       dp->encoder.funcs->destroy(&dp->encoder);
 }
 
 static const struct component_ops exynos_dp_ops = {

diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
index 8a58ad80f5096beab67a3f169b92d78cd920d16a..37250ab63bd741abe4e76374895267cc963f04e1 100644 (file)
--- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
+++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
@@ -259,13 +259,8 @@ static struct drm_encoder_helper_funcs rockchip_dp_encoder_helper_funcs = {
        .atomic_check = rockchip_dp_drm_encoder_atomic_check,
 };
 
-static void rockchip_dp_drm_encoder_destroy(struct drm_encoder *encoder)
-{
-       drm_encoder_cleanup(encoder);
-}
-
 static struct drm_encoder_funcs rockchip_dp_encoder_funcs = {
-       .destroy = rockchip_dp_drm_encoder_destroy,
+       .destroy = drm_encoder_cleanup,
 };
 
 static int rockchip_dp_of_probe(struct rockchip_dp_device *dp)
@@ -362,8 +357,10 @@ static int rockchip_dp_bind(struct device *dev, struct device *master,
        rockchip_drm_psr_register(&dp->encoder, analogix_dp_psr_set);
 
        dp->adp = analogix_dp_bind(dev, dp->drm_dev, &dp->plat_data);
-       if (IS_ERR(dp->adp))
+       if (IS_ERR(dp->adp)) {
+               dp->encoder.funcs->destroy(&dp->encoder);
                return PTR_ERR(dp->adp);
+       }
 
        return 0;
 }
@@ -375,6 +372,7 @@ static void rockchip_dp_unbind(struct device *dev, struct device *master,
 
        rockchip_drm_psr_unregister(&dp->encoder);
        analogix_dp_unbind(dp->adp);
+       dp->encoder.funcs->destroy(&dp->encoder);
 }
 
 static const struct component_ops rockchip_dp_component_ops = {