Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

This reverts commit 9b8c437ef1a5f34686fc96b391c201a80f1a2ea0.

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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20211002154542.15800-10-sean@poorly.run

+2 -4
+2 -4
drivers/gpu/drm/shmobile/shmob_drm_drv.c
··· 156 156 static int shmob_drm_pm_resume(struct device *dev) 157 157 { 158 158 struct shmob_drm_device *sdev = dev_get_drvdata(dev); 159 - struct drm_modeset_acquire_ctx ctx; 160 - int ret; 161 159 162 - DRM_MODESET_LOCK_ALL_BEGIN(sdev->ddev, ctx, 0, ret); 160 + drm_modeset_lock_all(sdev->ddev); 163 161 shmob_drm_crtc_resume(&sdev->crtc); 164 - DRM_MODESET_LOCK_ALL_END(sdev->ddev, ctx, ret); 162 + drm_modeset_unlock_all(sdev->ddev); 165 163 166 164 drm_kms_helper_poll_enable(sdev->ddev); 167 165 return 0;