diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-01-10 08:18:53 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-01-10 08:18:53 +1000 |
| commit | 9afe69d5a9495f8b023017e4c328fa717e00f092 (patch) | |
| tree | c78c4bb802fe2367bf2d7ff50f2ffe9e75cb346b | |
| parent | 6edd870bca30b3aa69370a99bcefc1e5f2b8b190 (diff) | |
| parent | f0a8b49c03d22a511a601dc54b2a3425a41e35fa (diff) | |
Merge tag 'drm-misc-fixes-2017-01-09' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes
Single drm bridge fix.
* tag 'drm-misc-fixes-2017-01-09' of git://anongit.freedesktop.org/git/drm-misc:
drm/bridge: analogix dp: Fix runtime PM state on driver bind
| -rw-r--r-- | drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index eb9bf8786c24..18eefdcbf1ba 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1382,6 +1382,7 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, pm_runtime_enable(dev); + pm_runtime_get_sync(dev); phy_power_on(dp->phy); analogix_dp_init_dp(dp); @@ -1414,9 +1415,15 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, goto err_disable_pm_runtime; } + phy_power_off(dp->phy); + pm_runtime_put(dev); + return 0; err_disable_pm_runtime: + + phy_power_off(dp->phy); + pm_runtime_put(dev); pm_runtime_disable(dev); return ret; |