From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 9 May 2014 06:14:15 +0000 (+0200)
Subject: drm/exynos: Fix double locks at PM resume
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a16f223e35325d1a9b9b3fce63d655e7b2c2a02a;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.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 <tiwai@suse.de>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
---

diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index d248d6e64424..4cef88ff35fd 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -182,9 +182,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;
 }