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 pending flushes after disable commit

Browse Source 
Clear any pending flushes after disable so that they are not
re-applied on the next enable for this encoder.

Change-Id: Ic8d387e60b6369062269c48611ee9a9de8887ec7
Signed-off-by: Steve Cohen <cohens@codeaurora.org>
This commit is contained in:
Steve Cohen
2020-11-11 13:32:33 -05:00
parent e09f74663b
commit a60eb29d55
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
msm/sde/sde_encoder.c
View File

@@ -2906,8 +2906,10 @@ void sde_encoder_helper_phys_disable(struct sde_encoder_phys *phys_enc,
struct sde_encoder_phys_wb *wb_enc) struct sde_encoder_phys_wb *wb_enc)
{ {
struct sde_encoder_virt *sde_enc; struct sde_encoder_virt *sde_enc;
struct sde_hw_ctl *ctl = phys_enc->hw_ctl;
struct sde_ctl_flush_cfg cfg;
phys_enc->hw_ctl->ops.reset(phys_enc->hw_ctl); ctl->ops.reset(ctl);
sde_encoder_helper_reset_mixers(phys_enc, NULL); sde_encoder_helper_reset_mixers(phys_enc, NULL);
if (wb_enc) { if (wb_enc) {
@@ -2915,10 +2917,8 @@ void sde_encoder_helper_phys_disable(struct sde_encoder_phys *phys_enc,
wb_enc->hw_wb->ops.bind_pingpong_blk(wb_enc->hw_wb, wb_enc->hw_wb->ops.bind_pingpong_blk(wb_enc->hw_wb,
false, phys_enc->hw_pp->idx); false, phys_enc->hw_pp->idx);
if (phys_enc->hw_ctl->ops.update_bitmask) if (ctl->ops.update_bitmask)
phys_enc->hw_ctl->ops.update_bitmask( ctl->ops.update_bitmask(ctl, SDE_HW_FLUSH_WB,
phys_enc->hw_ctl,
SDE_HW_FLUSH_WB,
wb_enc->hw_wb->idx, true); wb_enc->hw_wb->idx, true);
} }
} else { } else {
@@ -2927,10 +2927,8 @@ void sde_encoder_helper_phys_disable(struct sde_encoder_phys *phys_enc,
phys_enc->hw_intf, false, phys_enc->hw_intf, false,
phys_enc->hw_pp->idx); phys_enc->hw_pp->idx);
if (phys_enc->hw_ctl->ops.update_bitmask) if (ctl->ops.update_bitmask)
phys_enc->hw_ctl->ops.update_bitmask( ctl->ops.update_bitmask(ctl, SDE_HW_FLUSH_INTF,
phys_enc->hw_ctl,
SDE_HW_FLUSH_INTF,
phys_enc->hw_intf->idx, true); phys_enc->hw_intf->idx, true);
} }
} }
@@ -2938,10 +2936,8 @@ void sde_encoder_helper_phys_disable(struct sde_encoder_phys *phys_enc,
if (phys_enc->hw_pp && phys_enc->hw_pp->ops.reset_3d_mode) { if (phys_enc->hw_pp && phys_enc->hw_pp->ops.reset_3d_mode) {
phys_enc->hw_pp->ops.reset_3d_mode(phys_enc->hw_pp); phys_enc->hw_pp->ops.reset_3d_mode(phys_enc->hw_pp);
if (phys_enc->hw_ctl->ops.update_bitmask && if (ctl->ops.update_bitmask && phys_enc->hw_pp->merge_3d)
phys_enc->hw_pp->merge_3d) ctl->ops.update_bitmask(ctl, SDE_HW_FLUSH_MERGE_3D,
phys_enc->hw_ctl->ops.update_bitmask(
phys_enc->hw_ctl, SDE_HW_FLUSH_MERGE_3D,
phys_enc->hw_pp->merge_3d->idx, true); phys_enc->hw_pp->merge_3d->idx, true);
} }
@@ -2950,23 +2946,24 @@ void sde_encoder_helper_phys_disable(struct sde_encoder_phys *phys_enc,
phys_enc->hw_cdm->ops.bind_pingpong_blk(phys_enc->hw_cdm, phys_enc->hw_cdm->ops.bind_pingpong_blk(phys_enc->hw_cdm,
false, phys_enc->hw_pp->idx); false, phys_enc->hw_pp->idx);
if (phys_enc->hw_ctl->ops.update_bitmask) if (ctl->ops.update_bitmask)
phys_enc->hw_ctl->ops.update_bitmask( ctl->ops.update_bitmask(ctl, SDE_HW_FLUSH_CDM,
phys_enc->hw_ctl, SDE_HW_FLUSH_CDM,
phys_enc->hw_cdm->idx, true); phys_enc->hw_cdm->idx, true);
} }
sde_enc = to_sde_encoder_virt(phys_enc->parent); 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 &&
phys_enc->hw_ctl->ops.reset_post_disable) ctl->ops.reset_post_disable)
phys_enc->hw_ctl->ops.reset_post_disable( ctl->ops.reset_post_disable(ctl, &phys_enc->intf_cfg_v1,
phys_enc->hw_ctl, &phys_enc->intf_cfg_v1,
phys_enc->hw_pp->merge_3d ? phys_enc->hw_pp->merge_3d ?
phys_enc->hw_pp->merge_3d->idx : 0); phys_enc->hw_pp->merge_3d->idx : 0);
phys_enc->hw_ctl->ops.trigger_flush(phys_enc->hw_ctl); ctl->ops.get_pending_flush(ctl, &cfg);
phys_enc->hw_ctl->ops.trigger_start(phys_enc->hw_ctl); SDE_EVT32(DRMID(phys_enc->parent), cfg.pending_flush_mask);
ctl->ops.trigger_flush(ctl);
ctl->ops.trigger_start(ctl);
ctl->ops.clear_pending_flush(ctl);
} }
static enum sde_intf sde_encoder_get_intf(struct sde_mdss_cfg *catalog, static enum sde_intf sde_encoder_get_intf(struct sde_mdss_cfg *catalog,