summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Peng <robinpeng@google.com>2023-11-28 02:23:07 +0000
committerRobin Peng <robinpeng@google.com>2023-11-28 02:23:07 +0000
commit996715d859cb51d6cf7a7b7f9bd27ff1002f4136 (patch)
treee15c3e34ae5f9aa9e14f7ad85e32180b439b7078
parentaa26e201d93efdf075075bd86672164722da3267 (diff)
parente6a9789e42d6000bc6b3c187f76f09cc14009976 (diff)
downloaddisplay-996715d859cb51d6cf7a7b7f9bd27ff1002f4136.tar.gz
Merge "Merge android14-gs-pixel-5.15-udc-d2 into android14-gs-pixel-5.15-24Q1" into android14-gs-pixel-5.15-24Q1
-rw-r--r--samsung/exynos_drm_drv.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/samsung/exynos_drm_drv.c b/samsung/exynos_drm_drv.c
index cd233a6..d754eda 100644
--- a/samsung/exynos_drm_drv.c
+++ b/samsung/exynos_drm_drv.c
@@ -606,6 +606,11 @@ static void exynos_atomic_queue_work(struct drm_atomic_state *old_state)
struct decon_device *decon = crtc_to_decon(crtc);
struct kthread_work *work = &to_exynos_crtc_state(old_crtc_state)->commit_work;
+ if (decon->hibernation && old_crtc_state->active) {
+ hibernation_block(decon->hibernation);
+ hibernation_unblock_enter(decon->hibernation);
+ }
+
kthread_init_work(work, commit_kthread_work);
kthread_queue_work(&decon->worker, work);