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

Merge "Revert "disp: msm: sde: trigger esd recovery before event notification""

Browse Source
This commit is contained in:
qctecmdr
2020-10-01 00:36:12 -07:00
committed by Gerrit - the friendly Code Review server
parent d2aca007bb 01466c6032
commit 4063d019aa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
msm/sde/sde_encoder.c
View File

@@ -2695,7 +2695,8 @@ static void sde_encoder_virt_enable(struct drm_encoder *drm_enc)
!(msm_is_mode_seamless_vrr(cur_mode) !(msm_is_mode_seamless_vrr(cur_mode)
|| msm_is_mode_seamless_dms(cur_mode) || msm_is_mode_seamless_dms(cur_mode)
|| msm_is_mode_seamless_dyn_clk(cur_mode))) || msm_is_mode_seamless_dyn_clk(cur_mode)))
kthread_cancel_delayed_work_sync(&sde_enc->delayed_off_work); kthread_init_delayed_work(&sde_enc->delayed_off_work,
sde_encoder_off_work);
ret = sde_encoder_resource_control(drm_enc, SDE_ENC_RC_EVENT_KICKOFF); ret = sde_encoder_resource_control(drm_enc, SDE_ENC_RC_EVENT_KICKOFF);
if (ret) { if (ret) {
@@ -2855,7 +2856,6 @@ static void sde_encoder_virt_disable(struct drm_encoder *drm_enc)
*/ */
sde_enc->crtc = NULL; sde_enc->crtc = NULL;
memset(&sde_enc->mode_info, 0, sizeof(sde_enc->mode_info)); memset(&sde_enc->mode_info, 0, sizeof(sde_enc->mode_info));
kthread_cancel_delayed_work_sync(&sde_enc->delayed_off_work);
SDE_DEBUG_ENC(sde_enc, "encoder disabled\n"); SDE_DEBUG_ENC(sde_enc, "encoder disabled\n");