aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-12-01 19:36:59 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-01-20 16:16:51 -0500
commitb13f59804918ad584a97a639064a24d14e2fd740 (patch)
treeb4e6d4b5b3532694892522dbf712d345efec6d90
parent795f1426b484ddfc136e723a26bfd6a46c8ab085 (diff)
drm/shmobile: use drm_modeset_lock_all
Only a resume method to account for. v2: Fixup compilation. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/shmobile/shmob_drm_drv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
index d1d5306ebf24..f6e0b5395051 100644
--- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
@@ -313,9 +313,9 @@ static int shmob_drm_pm_resume(struct device *dev)
313{ 313{
314 struct shmob_drm_device *sdev = dev_get_drvdata(dev); 314 struct shmob_drm_device *sdev = dev_get_drvdata(dev);
315 315
316 mutex_lock(&sdev->ddev->mode_config.mutex); 316 drm_modeset_lock_all(sdev->ddev);
317 shmob_drm_crtc_resume(&sdev->crtc); 317 shmob_drm_crtc_resume(&sdev->crtc);
318 mutex_unlock(&sdev->ddev->mode_config.mutex); 318 drm_modeset_unlock_all(sdev->ddev);
319 319
320 drm_kms_helper_poll_enable(sdev->ddev); 320 drm_kms_helper_poll_enable(sdev->ddev);
321 return 0; 321 return 0;