shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "drm/bridge: analogix_dp: Fix unbalanced phy_power_on"

Browse Source 
This reverts commit e82ecb98b4.

Change-Id: Ice373a612fdd7fa457ca0ce18026128b83edcc1f
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
This commit is contained in:
Wyon Bi
2019-01-23 10:32:59 +08:00
committed by Tao Huang
parent 2847572fdb
commit 35c77451c5
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
View File

@@ -861,14 +861,10 @@ static int analogix_dp_loader_protect(struct drm_connector *connector, bool on)
if (dp->plat_data->panel)
drm_panel_loader_protect(dp->plat_data->panel, on);
if (on) {
if (on)
pm_runtime_get_sync(dp->dev);
phy_power_on(dp->phy);
} else {
phy_power_off(dp->phy);
else
pm_runtime_put(dp->dev);
}
return 0;
}
@@ -1213,7 +1209,7 @@ analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,
dp->phy = devm_phy_get(dp->dev, "dp");
if (IS_ERR(dp->phy)) {
dev_dbg(dp->dev, "no DP phy configured\n");
dev_err(dp->dev, "no DP phy configured\n");
ret = PTR_ERR(dp->phy);
if (ret) {
/*
@@ -1260,6 +1256,8 @@ analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,
return ERR_PTR(-ENODEV);
}
phy_power_on(dp->phy);
if (dp->plat_data->panel) {
if (drm_panel_prepare(dp->plat_data->panel)) {
DRM_ERROR("failed to setup the panel\n");