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

Commit 63872659 authored by Lin Huang's avatar Lin Huang Committed by Andrzej Hajda
Browse files

drm/bridge: analogix_dp: Ensure edp is disabled when shutting down the panel 



When panel is shut down, we should make sure edp can be disabled to avoid
undefined behavior.

Cc: Stéphane Marchesin <marcheu@chromium.org>
Signed-off-by: default avatarLin Huang <hl@rock-chips.com>
Signed-off-by: default avatarzain wang <wzz@rock-chips.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarThierry Escande <thierry.escande@collabora.com>
Reviewed-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180423105003.9004-8-enric.balletbo@collabora.com
parent d79acb59

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

+11 −0
Original line number Original line Diff line number Diff line
@@ -1160,6 +1160,12 @@ static int analogix_dp_set_bridge(struct analogix_dp_device *dp) 




	pm_runtime_get_sync(dp->dev);

	pm_runtime_get_sync(dp->dev);





	ret = clk_prepare_enable(dp->clock);

	if (ret < 0) {

		DRM_ERROR("Failed to prepare_enable the clock clk [%d]\n", ret);

		goto out_dp_clk_pre;

	}



	if (dp->plat_data->power_on)

	if (dp->plat_data->power_on)

		dp->plat_data->power_on(dp->plat_data);

		dp->plat_data->power_on(dp->plat_data);
@@ -1191,6 +1197,8 @@ static int analogix_dp_set_bridge(struct analogix_dp_device *dp) 
	phy_power_off(dp->phy);

	phy_power_off(dp->phy);

	if (dp->plat_data->power_off)

	if (dp->plat_data->power_off)

		dp->plat_data->power_off(dp->plat_data);

		dp->plat_data->power_off(dp->plat_data);

	clk_disable_unprepare(dp->clock);

out_dp_clk_pre:

	pm_runtime_put_sync(dp->dev);

	pm_runtime_put_sync(dp->dev);





	return ret;

	return ret;
@@ -1233,11 +1241,14 @@ static void analogix_dp_bridge_disable(struct drm_bridge *bridge) 
	}

	}





	disable_irq(dp->irq);

	disable_irq(dp->irq);

	analogix_dp_set_analog_power_down(dp, POWER_ALL, 1);

	phy_power_off(dp->phy);

	phy_power_off(dp->phy);





	if (dp->plat_data->power_off)

	if (dp->plat_data->power_off)

		dp->plat_data->power_off(dp->plat_data);

		dp->plat_data->power_off(dp->plat_data);





	clk_disable_unprepare(dp->clock);



	pm_runtime_put_sync(dp->dev);

	pm_runtime_put_sync(dp->dev);





	ret = analogix_dp_prepare_panel(dp, false, true);

	ret = analogix_dp_prepare_panel(dp, false, true);