drm/ast: Fix double lock 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 ast driver still takes
this lock before calling it.  Remove the caller side lock for avoid a
fatal deadlock.

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

diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
index 2ba39ac7d222119cb6ee7b505f1ae701bec0ed49..44074fbcf7ff135a8c1bb3ac3d5eea9955845442 100644 (file)
--- a/drivers/gpu/drm/ast/ast_drv.c
+++ b/drivers/gpu/drm/ast/ast_drv.c
@@ -94,9 +94,7 @@ static int ast_drm_thaw(struct drm_device *dev)
        ast_post_gpu(dev);
 
        drm_mode_config_reset(dev);
-       drm_modeset_lock_all(dev);
        drm_helper_resume_force_mode(dev);
-       drm_modeset_unlock_all(dev);
 
        console_lock();
        ast_fbdev_set_suspend(dev, 0);