aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzain wang <wzz@rock-chips.com>2018-03-05 03:57:39 -0500
committerAndrzej Hajda <a.hajda@samsung.com>2018-03-07 10:17:56 -0500
commitea2a14da0f191e93c0924acb4ab8a9009e33de81 (patch)
tree89cec07ece8a95951bff9c56c10032c9aa491a28
parent186ca446aea19e49d2e1433dd170c6e1c211a52a (diff)
drm/bridge: analogix_dp: Don't power bridge in analogix_dp_bind
The bridge does not need to be powered in analogix_dp_bind(), so remove the calls to pm_runtime_get()/phy_power_on()/analogix_dp_init_dp() as well as their power-off counterparts. Cc: Stéphane Marchesin <marcheu@chromium.org> Signed-off-by: zain wang <wzz@rock-chips.com> Signed-off-by: Caesar Wang <wxt@rock-chips.com> [the patch originally just removed the power_on portion, seanpaul removed the power off code as well as improved the commit message] Signed-off-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Thierry Escande <thierry.escande@collabora.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Tested-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180305085741.18896-2-m.szyprowski@samsung.com
-rw-r--r--drivers/gpu/drm/bridge/analogix/analogix_dp_core.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 3f7a796b27e4..8475749baae5 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1378,11 +1378,6 @@ analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,
1378 1378
1379 pm_runtime_enable(dev); 1379 pm_runtime_enable(dev);
1380 1380
1381 pm_runtime_get_sync(dev);
1382 phy_power_on(dp->phy);
1383
1384 analogix_dp_init_dp(dp);
1385
1386 ret = devm_request_threaded_irq(&pdev->dev, dp->irq, 1381 ret = devm_request_threaded_irq(&pdev->dev, dp->irq,
1387 analogix_dp_hardirq, 1382 analogix_dp_hardirq,
1388 analogix_dp_irq_thread, 1383 analogix_dp_irq_thread,
@@ -1410,15 +1405,10 @@ analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,
1410 goto err_disable_pm_runtime; 1405 goto err_disable_pm_runtime;
1411 } 1406 }
1412 1407
1413 phy_power_off(dp->phy);
1414 pm_runtime_put(dev);
1415
1416 return dp; 1408 return dp;
1417 1409
1418err_disable_pm_runtime: 1410err_disable_pm_runtime:
1419 1411
1420 phy_power_off(dp->phy);
1421 pm_runtime_put(dev);
1422 pm_runtime_disable(dev); 1412 pm_runtime_disable(dev);
1423 1413
1424 return ERR_PTR(ret); 1414 return ERR_PTR(ret);