diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-05-09 08:14:15 +0200 |
|---|---|---|
| committer | Inki Dae <daeinki@gmail.com> | 2014-06-02 02:07:06 +0900 |
| commit | a16f223e35325d1a9b9b3fce63d655e7b2c2a02a (patch) | |
| tree | 91f78b3cd657ac2423a3eb07d1b0518cb230fc63 | |
| parent | 073ea2ae85629d4074596e2616588b13d4c665f7 (diff) | |
| download | linux-a16f223e35325d1a9b9b3fce63d655e7b2c2a02a.tar.gz linux-a16f223e35325d1a9b9b3fce63d655e7b2c2a02a.tar.bz2 linux-a16f223e35325d1a9b9b3fce63d655e7b2c2a02a.zip | |
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>
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |