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

disp: msm: sde: clear intf mux select on slave encoders

Browse Source 
When disabling an encoder with multiple physical encoders, the
intf mux must be cleared on all interfaces. Currently only the master
physical encoder is being cleared, leading to possible DSI
underflow errors. This change ensures that the mux is cleared
on all interface blocks.

Change-Id: Idb1b96fd65545e3599100e70ace22bc3837d7233
Signed-off-by: Nilaan Gunabalachandran <ngunabal@codeaurora.org>
This commit is contained in:
Nilaan Gunabalachandran
2021-09-16 14:47:23 -04:00
parent 785cde38ef
commit 95a41081eb
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
msm/sde/sde_encoder.c
View File

@@ -3163,10 +3163,13 @@ void sde_encoder_helper_phys_disable(struct sde_encoder_phys *phys_enc,
struct sde_encoder_virt *sde_enc; struct sde_encoder_virt *sde_enc;
struct sde_hw_ctl *ctl = phys_enc->hw_ctl; struct sde_hw_ctl *ctl = phys_enc->hw_ctl;
struct sde_ctl_flush_cfg cfg; struct sde_ctl_flush_cfg cfg;
int i;
ctl->ops.reset(ctl); ctl->ops.reset(ctl);
sde_encoder_helper_reset_mixers(phys_enc, NULL); sde_encoder_helper_reset_mixers(phys_enc, NULL);
sde_enc = to_sde_encoder_virt(phys_enc->parent);
if (wb_enc) { if (wb_enc) {
if (wb_enc->hw_wb->ops.bind_pingpong_blk) { if (wb_enc->hw_wb->ops.bind_pingpong_blk) {
wb_enc->hw_wb->ops.bind_pingpong_blk(wb_enc->hw_wb, wb_enc->hw_wb->ops.bind_pingpong_blk(wb_enc->hw_wb,
@@ -3177,14 +3180,16 @@ void sde_encoder_helper_phys_disable(struct sde_encoder_phys *phys_enc,
wb_enc->hw_wb->idx, true); wb_enc->hw_wb->idx, true);
} }
} else { } else {
if (phys_enc->hw_intf->ops.bind_pingpong_blk) { for (i = 0; i < sde_enc->num_phys_encs; i++) {
phys_enc->hw_intf->ops.bind_pingpong_blk( if (sde_enc->phys_encs[i] && phys_enc->hw_intf->ops.bind_pingpong_blk) {
phys_enc->hw_intf, false, phys_enc->hw_intf->ops.bind_pingpong_blk(
phys_enc->hw_pp->idx); sde_enc->phys_encs[i]->hw_intf, false,
sde_enc->phys_encs[i]->hw_pp->idx);
if (ctl->ops.update_bitmask) if (ctl->ops.update_bitmask)
ctl->ops.update_bitmask(ctl, SDE_HW_FLUSH_INTF, ctl->ops.update_bitmask(ctl, SDE_HW_FLUSH_INTF,
phys_enc->hw_intf->idx, true); sde_enc->phys_encs[i]->hw_intf->idx, true);
}
} }
} }
@@ -3206,8 +3211,6 @@ void sde_encoder_helper_phys_disable(struct sde_encoder_phys *phys_enc,
phys_enc->hw_cdm->idx, true); phys_enc->hw_cdm->idx, true);
} }
sde_enc = to_sde_encoder_virt(phys_enc->parent);
if (phys_enc == sde_enc->cur_master && phys_enc->hw_pp && if (phys_enc == sde_enc->cur_master && phys_enc->hw_pp &&
ctl->ops.reset_post_disable) ctl->ops.reset_post_disable)
ctl->ops.reset_post_disable(ctl, &phys_enc->intf_cfg_v1, ctl->ops.reset_post_disable(ctl, &phys_enc->intf_cfg_v1,