Commit 03b476fa authored by Sean Paul's avatar Sean Paul
Browse files

Revert "drm/shmobile: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()" 



This reverts commit 9b8c437e.

This patchset breaks on intel platforms and was previously NACK'd by
Ville.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Fernando Ramos <greenfoo@u92.eu>
Acked-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20211002154542.15800-10-sean@poorly.run
parent d91a342e

drivers/gpu/drm/shmobile/shmob_drm_drv.c

+2 −4
Original line number Diff line number Diff line
@@ -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;