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: cancel delayed_off_work before reinitialization"

Browse Source
This commit is contained in:
qctecmdr
2021-06-09 10:00:48 -07:00
committed by Gerrit - the friendly Code Review server
parent 4ed05e18ad 9d4d003e30
commit 4f79a6ceef
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
msm/sde/sde_encoder.c
View File

@@ -1995,9 +1995,6 @@ static int _sde_encoder_rc_pre_modeset(struct drm_encoder *drm_enc,
{ {
int ret = 0; int ret = 0;
/* cancel delayed off work, if any */
_sde_encoder_rc_cancel_delayed(sde_enc, sw_event);
mutex_lock(&sde_enc->rc_lock); mutex_lock(&sde_enc->rc_lock);
if (sde_enc->rc_state == SDE_ENC_RC_STATE_OFF) { if (sde_enc->rc_state == SDE_ENC_RC_STATE_OFF) {
@@ -2510,6 +2507,9 @@ static void sde_encoder_virt_mode_set(struct drm_encoder *drm_enc,
return; return;
} }
/* cancel delayed off work, if any */
kthread_cancel_delayed_work_sync(&sde_enc->delayed_off_work);
/* release resources before seamless mode change */ /* release resources before seamless mode change */
msm_mode = &c_state->msm_mode; msm_mode = &c_state->msm_mode;
ret = sde_encoder_virt_modeset_rc(drm_enc, msm_mode, true); ret = sde_encoder_virt_modeset_rc(drm_enc, msm_mode, true);