diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-12-01 19:34:59 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-01-20 16:16:50 -0500 |
commit | 795f1426b484ddfc136e723a26bfd6a46c8ab085 (patch) | |
tree | a8677e1f1b54bfa42d6943995c9ada14f15af53b | |
parent | 0a819515fc346b4e79d6e3fc01d837a660452c74 (diff) |
drm/ast: use drm_modeset_lock_all
Just a call to drm_helper_resume_force_mode, obviously wants full
locking for that.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/ast/ast_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c index 2d2c2f8d6dc6..df0d0a08097a 100644 --- a/drivers/gpu/drm/ast/ast_drv.c +++ b/drivers/gpu/drm/ast/ast_drv.c | |||
@@ -94,9 +94,9 @@ static int ast_drm_thaw(struct drm_device *dev) | |||
94 | ast_post_gpu(dev); | 94 | ast_post_gpu(dev); |
95 | 95 | ||
96 | drm_mode_config_reset(dev); | 96 | drm_mode_config_reset(dev); |
97 | mutex_lock(&dev->mode_config.mutex); | 97 | drm_modeset_lock_all(dev); |
98 | drm_helper_resume_force_mode(dev); | 98 | drm_helper_resume_force_mode(dev); |
99 | mutex_unlock(&dev->mode_config.mutex); | 99 | drm_modeset_unlock_all(dev); |
100 | 100 | ||
101 | console_lock(); | 101 | console_lock(); |
102 | ast_fbdev_set_suspend(dev, 0); | 102 | ast_fbdev_set_suspend(dev, 0); |