[PATCH v2 4/4] media: platform: mtk-mdp3: Set rdma compression reg in each frame

[roy-cw.yeh]

From: "Roy-CW.Yeh" <roy-cw.yeh at mediatek.com>

Set rdma compression reg in each frame

Signed-off-by: Roy-CW.Yeh <roy-cw.yeh at mediatek.com>
---
 .../media/platform/mtk-mdp3/mtk-mdp3-comp.c    | 18 ++++++------------
 .../media/platform/mtk-mdp3/mtk-mdp3-core.c    |  2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/drivers/media/platform/mtk-mdp3/mtk-mdp3-comp.c b/drivers/media/platform/mtk-mdp3/mtk-mdp3-comp.c
index 12d6c88c68d2..3424e609de55 100644
--- a/drivers/media/platform/mtk-mdp3/mtk-mdp3-comp.c
+++ b/drivers/media/platform/mtk-mdp3/mtk-mdp3-comp.c
@@ -174,24 +174,18 @@ static int config_rdma_frame(struct mdp_comp_ctx *ctx,
 				     ((width + 31) >> 5) << 5, 0x001FFFFF);
 			MM_REG_WRITE(cmd, subsys_id, base, MDP_RDMA_MF_BKGD_H_SIZE_IN_PXL,
 				     ((height + 7) >> 3) << 3, 0x001FFFFF);
-
-			/* Setup Compression Control */
-			MM_REG_WRITE(cmd, subsys_id, base, MDP_RDMA_COMP_CON,
-				     rdma->comp_ctrl, write_mask);
-		}
-
-		if (mdp_cfg->rdma_support_afbc &&
-		    (MDP_COLOR_IS_COMPRESS(colorformat))) {
+		} else if (mdp_cfg->rdma_support_afbc &&
+			   (MDP_COLOR_IS_COMPRESS(colorformat))) {
 			MM_REG_WRITE(cmd, subsys_id, base, MDP_RDMA_MF_BKGD_SIZE_IN_PXL,
 				     ((width + 31) >> 5) << 5, 0x001FFFFF);
 			MM_REG_WRITE(cmd, subsys_id, base, MDP_RDMA_MF_BKGD_H_SIZE_IN_PXL,
 				     ((height + 7) >> 3) << 3, 0x001FFFFF);
-
-			/* Setup Compression Control */
-			MM_REG_WRITE(cmd, subsys_id, base, MDP_RDMA_COMP_CON,
-				     rdma->comp_ctrl, write_mask);
 		}
 
+		/* Setup Compression Control */
+		MM_REG_WRITE(cmd, subsys_id, base, MDP_RDMA_COMP_CON,
+			     rdma->comp_ctrl, write_mask);
+
 		if (mdp_cfg->rdma_esl_setting) {
 			MM_REG_WRITE(cmd, subsys_id, base, MDP_RDMA_DMABUF_CON_0,
 				     rdma->dmabuf_con0, 0x0FFF00FF);
diff --git a/drivers/media/platform/mtk-mdp3/mtk-mdp3-core.c b/drivers/media/platform/mtk-mdp3/mtk-mdp3-core.c
index 51f7ef2b31ce..06bcd7505c4b 100644
--- a/drivers/media/platform/mtk-mdp3/mtk-mdp3-core.c
+++ b/drivers/media/platform/mtk-mdp3/mtk-mdp3-core.c
@@ -34,7 +34,7 @@ static const struct mdp_platform_config mt8195_plat_cfg = {
 	.rdma_support_afbc              = true,
 	.rdma_esl_setting               = true,
 	.rdma_rsz1_sram_sharing         = false,
-	.rdma_upsample_repeat_only      = true,
+	.rdma_upsample_repeat_only      = false,
 	.rsz_disable_dcm_small_sample   = false,
 	.rsz_etc_control                = true,
 	.wrot_filter_constraint         = false,
-- 
2.18.0