From d5e0182a1e906f75cfa56d32b017623b5abe9e1a Mon Sep 17 00:00:00 2001 From: Nilaan Gunabalachandran Date: Fri, 20 Sep 2019 15:19:35 -0400 Subject: [PATCH] disp: msm: sde: add pending flush for merge3d While disabling merge3d block, pending flush mask needs to be set for merge3d. Change-Id: Ic7baea278ac62ac1203aad8a33c40874704c85a1 Signed-off-by: Nilaan Gunabalachandran --- msm/sde/sde_hw_ctl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/msm/sde/sde_hw_ctl.c b/msm/sde/sde_hw_ctl.c index 033682eb064f..00af12bc3af8 100644 --- a/msm/sde/sde_hw_ctl.c +++ b/msm/sde/sde_hw_ctl.c @@ -1041,6 +1041,7 @@ static int sde_hw_ctl_reset_post_disable(struct sde_hw_ctl *ctx, ctx->flush.pending_merge_3d_flush_mask = BIT(merge_3d_idx - MERGE_3D_0); merge_3d_active &= ~BIT(merge_3d_idx - MERGE_3D_0); + UPDATE_MASK(ctx->flush.pending_flush_mask, MERGE_3D_IDX, 1); SDE_REG_WRITE(c, CTL_MERGE_3D_ACTIVE, merge_3d_active); }