From: Takashi Iwai Date: Fri, 9 May 2014 06:14:15 +0000 (+0200) Subject: drm/exynos: Fix double locks at PM resume X-Git-Tag: v4.9.8~6258^2~16^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4f0fd8ca3250c7546148a89eec26ff3b8140103;p=platform%2Fkernel%2Flinux-rpi3.git 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 Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index 2d27ba2..79410b0 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -183,9 +183,9 @@ static int exynos_drm_resume(struct drm_device *dev) if (connector->funcs->dpms) connector->funcs->dpms(connector, connector->dpms); } + drm_modeset_unlock_all(dev); drm_helper_resume_force_mode(dev); - drm_modeset_unlock_all(dev); return 0; }