Skip to content

Commit

Permalink
Revert "drm/shmobile: cleanup: drm_modeset_lock_all() --> DRM_MODESET…
Browse files Browse the repository at this point in the history
…_LOCK_ALL_BEGIN()"

This reverts commit 9b8c437.

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
  • Loading branch information
Sean Paul committed Oct 4, 2021
1 parent d91a342 commit 03b476f
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/gpu/drm/shmobile/shmob_drm_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 03b476f

Please sign in to comment.