Commit e4f0fd8c authored May 09, 2014 by Takashi Iwai Committed by Daniel Vetter Jun 02, 2014

drm/exynos: Fix double locks at PM resume



The recent commit [3ea87855: drm/helper: lock all around force mode
restore] introduced drm_modeset_lock_all() in
drm_helper_resume_force_mode() itself, while exynos driver takes this
lock before calling it.  Move the function call outside the lock for
avoiding a deadlock.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent d3dbd9b2

drivers/gpu/drm/exynos/exynos_drm_drv.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -183,9 +183,9 @@ static int exynos_drm_resume(struct drm_device *dev)
	if (connector->funcs->dpms)		if (connector->funcs->dpms)
	connector->funcs->dpms(connector, connector->dpms);		connector->funcs->dpms(connector, connector->dpms);
	}		}
			drm_modeset_unlock_all(dev);

	drm_helper_resume_force_mode(dev);		drm_helper_resume_force_mode(dev);
	drm_modeset_unlock_all(dev);

	return 0;		return 0;
	}		}