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

Commit 9afe69d5 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents 6edd870b f0a8b49c

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

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