leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/ast: Fix double lock at PM resume

Browse Source 
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>
This commit is contained in:
Takashi Iwai
2014-05-09 08:14:14 +02:00
committed by Daniel Vetter
parent 2a8dc638f7
commit d3dbd9b21e
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/ast/ast_drv.c
View File

@@ -94,9 +94,7 @@ static int ast_drm_thaw(struct drm_device *dev)
ast_post_gpu(dev); ast_post_gpu(dev);
drm_mode_config_reset(dev); drm_mode_config_reset(dev);
drm_modeset_lock_all(dev);
drm_helper_resume_force_mode(dev); drm_helper_resume_force_mode(dev);
drm_modeset_unlock_all(dev);
console_lock(); console_lock();
ast_fbdev_set_suspend(dev, 0); ast_fbdev_set_suspend(dev, 0);