From: Sean Paul <seanpaul@xxxxxxxxxxxx>
This reverts commit 9b8c437ef1a5f34686fc96b391c201a80f1a2ea0.
This patchset breaks on intel platforms and was previously NACK'd by
Ville.
Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Cc: Fernando Ramos <greenfoo@xxxxxx>
Signed-off-by: Sean Paul <seanpaul@xxxxxxxxxxxx>
---
drivers/gpu/drm/shmobile/shmob_drm_drv.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
index 8ee215ab614e..7db01904d18d 100644
--- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
@@ -156,12 +156,10 @@ static int shmob_drm_pm_suspend(struct device *dev)
static int shmob_drm_pm_resume(struct device *dev)
{
struct shmob_drm_device *sdev = dev_get_drvdata(dev);
- struct drm_modeset_acquire_ctx ctx;
- int ret;
- DRM_MODESET_LOCK_ALL_BEGIN(sdev->ddev, ctx, 0, ret);
+ drm_modeset_lock_all(sdev->ddev);
shmob_drm_crtc_resume(&sdev->crtc);
- DRM_MODESET_LOCK_ALL_END(sdev->ddev, ctx, ret);
+ drm_modeset_unlock_all(sdev->ddev);
drm_kms_helper_poll_enable(sdev->ddev);
return 0;
--
Sean Paul, Software Engineer, Google / Chromium OS
