Merge "drm/msm/sde: Set the rotator dev state to active on resume" into dev/msm-4.14-display

drivers/media/platform/msm/sde/rotator/sde_rotator_core.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -3342,6 +3342,7 @@ int sde_rotator_pm_resume(struct device *dev)
		*/
		pm_runtime_disable(dev);
		pm_runtime_set_suspended(dev);
		pm_runtime_set_active(dev);
		pm_runtime_enable(dev);

		sde_rot_mgr_lock(mgr);