samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp: msm: sde: trigger a suspend commit if display in video mode"

Browse Source
This commit is contained in:
qctecmdr
2023-06-02 01:09:42 -07:00
committed by Gerrit - the friendly Code Review server
parent c90858d892 7fb1d48409
commit 68e4c1a426
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
msm/sde/sde_kms.c
View File

@@ -4187,7 +4187,8 @@ retry:
continue; continue;
lp = sde_connector_get_lp(conn); lp = sde_connector_get_lp(conn);
if (lp == SDE_MODE_DPMS_LP1) { if (lp == SDE_MODE_DPMS_LP1 &&
!sde_encoder_check_curr_mode(conn->encoder, MSM_DISPLAY_VIDEO_MODE)) {
/* transition LP1->LP2 on pm suspend */ /* transition LP1->LP2 on pm suspend */
ret = sde_connector_set_property_for_commit(conn, state, ret = sde_connector_set_property_for_commit(conn, state,
CONNECTOR_PROP_LP, SDE_MODE_DPMS_LP2); CONNECTOR_PROP_LP, SDE_MODE_DPMS_LP2);
@@ -4199,7 +4200,8 @@ retry:
} }
} }
if (lp != SDE_MODE_DPMS_LP2) { if (lp != SDE_MODE_DPMS_LP2 ||
sde_encoder_check_curr_mode(conn->encoder, MSM_DISPLAY_VIDEO_MODE)) {
/* force CRTC to be inactive */ /* force CRTC to be inactive */
crtc_state = drm_atomic_get_crtc_state(state, crtc_state = drm_atomic_get_crtc_state(state,
conn->state->crtc); conn->state->crtc);
@@ -4211,7 +4213,8 @@ retry:
goto unlock; goto unlock;
} }
if (lp != SDE_MODE_DPMS_LP1) if (lp != SDE_MODE_DPMS_LP1 ||
sde_encoder_check_curr_mode(conn->encoder, MSM_DISPLAY_VIDEO_MODE))
crtc_state->active = false; crtc_state->active = false;
++num_crtcs; ++num_crtcs;
} }