OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d91a342
)
Revert "drm/shmobile: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()"
author
Sean Paul
<seanpaul@chromium.org>
Sat, 2 Oct 2021 15:45:36 +0000
(11:45 -0400)
committer
Sean Paul
<seanpaul@chromium.org>
Mon, 4 Oct 2021 13:34:56 +0000
(09:34 -0400)
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
drivers/gpu/drm/shmobile/shmob_drm_drv.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/shmobile/shmob_drm_drv.c
b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
index
8ee215a
..
7db0190
100644
(file)
--- 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;