drm/ast: Fix double lock at PM resume
authorTakashi Iwai <tiwai@suse.de>
Fri, 9 May 2014 06:14:14 +0000 (08:14 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 2 Jun 2014 07:57:29 +0000 (09:57 +0200)
commitd3dbd9b21eb2b85c45522af676dc63c7de887caf
tree4bb90511c85cc7fcbb837aa12b722414748e2b54
parent2a8dc638f7af27ced60728e105752840fcd1538a
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>
drivers/gpu/drm/ast/ast_drv.c