diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-05-09 02:14:15 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-06-02 03:57:29 -0400 |
commit | e4f0fd8ca3250c7546148a89eec26ff3b8140103 (patch) | |
tree | b60f429b576531d8f4117d67af60891fc0ebf10d /drivers/gpu/drm | |
parent | d3dbd9b21eb2b85c45522af676dc63c7de887caf (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm')
-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 2d27ba23a6a8..79410b0c4bbf 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) | |||
183 | if (connector->funcs->dpms) | 183 | if (connector->funcs->dpms) |
184 | connector->funcs->dpms(connector, connector->dpms); | 184 | connector->funcs->dpms(connector, connector->dpms); |
185 | } | 185 | } |
186 | drm_modeset_unlock_all(dev); | ||
186 | 187 | ||
187 | drm_helper_resume_force_mode(dev); | 188 | drm_helper_resume_force_mode(dev); |
188 | drm_modeset_unlock_all(dev); | ||
189 | 189 | ||
190 | return 0; | 190 | return 0; |
191 | } | 191 | } |