Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fe201cd authored by Jeffy Chen's avatar Jeffy Chen Committed by Heiko Stuebner
Browse files

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: default avatarJeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: default avatarThierry Escande <thierry.escande@collabora.com>
Reviewed-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20180110162348.22765-3-thierry.escande@collabora.com
parent 6b2d8fd9

drivers/gpu/drm/bridge/analogix/analogix_dp_core.c

+0 −2
Original line number Diff line number Diff line
@@ -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))

drivers/gpu/drm/exynos/exynos_dp.c

+5 −2
Original line number Diff line number Diff line
@@ -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 = {

drivers/gpu/drm/rockchip/analogix_dp-rockchip.c

+5 −7
Original line number Diff line number Diff line
@@ -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 = {