diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-04-09 18:24:53 -0700 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2023-04-09 18:24:53 -0700 |
| commit | d8df397caa8dae458675cb0698457ce2001980a3 (patch) | |
| tree | a8901105b9102b3944cd24ceae2082289bf19ca3 | |
| parent | 1b6b6af0a87be80659f1f4cfcb03479681c48c95 (diff) | |
| parent | b2b476d5a5a6fd97663b5e98d255c661a6ed1f07 (diff) | |
| download | display-d8df397caa8dae458675cb0698457ce2001980a3.tar.gz | |
Merge android13-gs-pixel-5.10-tm-qpr3 into android13-gs-pixel-5.10-udc
SBMerger: 516612970
Change-Id: Ic325879d956ee882d8e978604aa6f05627ae0660
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | samsung/exynos_drm_dsim.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/samsung/exynos_drm_dsim.c b/samsung/exynos_drm_dsim.c index 7ce6ce0..d95fbc3 100644 --- a/samsung/exynos_drm_dsim.c +++ b/samsung/exynos_drm_dsim.c @@ -528,7 +528,10 @@ static void dsim_encoder_disable(struct drm_encoder *encoder, struct drm_atomic_ pm_runtime_put_sync(dsim->dev); } } else { - if (was_in_self_refresh) { + if (dsim->state == DSIM_STATE_BYPASS) { + pm_runtime_set_suspended(dsim->dev); + dsim->state = DSIM_STATE_SUSPEND; + } else if (was_in_self_refresh) { /* get extra ref count dropped when going into self refresh */ pm_runtime_get_sync(dsim->dev); |