From 6f19479bcc0be54de27e2531f393a6d726bfb2ee Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Sun, 2 Dec 2012 01:36:59 +0100 Subject: [PATCH] --- yaml --- r: 357957 b: refs/heads/master c: b13f59804918ad584a97a639064a24d14e2fd740 h: refs/heads/master i: 357955: 8a457a8b6506a21c91ff636e267d8af76856f14b v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b61980e16b1d..9b383feceaaf 100644 --- 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 index d1d5306ebf24..f6e0b5395051 100644 --- 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;