diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2014-05-09 08:14:14 +0200 |
|---|---|---|
| committer |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-06-02 09:57:29 +0200 |
| commit | d3dbd9b21eb2b85c45522af676dc63c7de887caf (patch) | |
| tree | 4bb90511c85cc7fcbb837aa12b722414748e2b54 /drivers/gpu/drm/ast/ast_drv.c | |
| parent | drm/dp-helper: Deprecate old i2c-over-dp_aux heleprs (diff) | |
| download | linux-dev-d3dbd9b21eb2b85c45522af676dc63c7de887caf.tar.xz linux-dev-d3dbd9b21eb2b85c45522af676dc63c7de887caf.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/ast/ast_drv.c')
| -rw-r--r-- | drivers/gpu/drm/ast/ast_drv.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c index 2ba39ac7d222..44074fbcf7ff 100644 --- 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); |