---

yaml --- r: 357957 b: refs/heads/master c: b13f598 h: refs/heads/master i: 357955: 8a457a8 v: v3
git-mirror · Jan 20, 2013 · 6f19479 · 6f19479
1 parent dae531a
commit 6f19479
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 795f1426b484ddfc136e723a26bfd6a46c8ab085
+refs/heads/master: b13f59804918ad584a97a639064a24d14e2fd740
diff --git a/trunk/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/trunk/drivers/gpu/drm/shmobile/shmob_drm_drv.c
@@ -313,9 +313,9 @@ static int shmob_drm_pm_resume(struct device *dev)
 {
 	struct shmob_drm_device *sdev = dev_get_drvdata(dev);
 
-	mutex_lock(&sdev->ddev->mode_config.mutex);
+	drm_modeset_lock_all(sdev->ddev);
 	shmob_drm_crtc_resume(&sdev->crtc);
-	mutex_unlock(&sdev->ddev->mode_config.mutex);
+	drm_modeset_unlock_all(sdev->ddev);
 
 	drm_kms_helper_poll_enable(sdev->ddev);
 	return 0;