From b34e02b6416d4a27e96f7954afb049069c8be592 Mon Sep 17 00:00:00 2001 From: Jayaprakash Madisetty Date: Thu, 24 Jun 2021 16:55:44 +0530 Subject: [PATCH] disp: msm: sde: enable merge_3d_active in ctl when mode_3d is set Add changes to set merge_3d_active in ctl datapath when mode3d is enabled without half panel partial update. Change-Id: I35c1f4c6045c4040cac730f23a6d9ce5f36cf5fb Signed-off-by: Jayaprakash Madisetty --- msm/sde/sde_encoder_dce.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/msm/sde/sde_encoder_dce.c b/msm/sde/sde_encoder_dce.c index 07bf4f6f6f7a..cde539fdd732 100644 --- a/msm/sde/sde_encoder_dce.c +++ b/msm/sde/sde_encoder_dce.c @@ -243,7 +243,7 @@ static void _dce_dsc_pipe_cfg(struct sde_hw_dsc *hw_dsc, if (mode_3d && disable_merge_3d && hw_pp->ops.reset_3d_mode) { SDE_DEBUG("disabling 3d mux \n"); hw_pp->ops.reset_3d_mode(hw_pp); - } else if (mode_3d && disable_merge_3d && hw_pp->ops.setup_3d_mode) { + } else if (mode_3d && !disable_merge_3d && hw_pp->ops.setup_3d_mode) { SDE_DEBUG("enabling 3d mux \n"); hw_pp->ops.setup_3d_mode(hw_pp, mode_3d); } @@ -313,7 +313,7 @@ static int _dce_dsc_setup_single(struct sde_encoder_virt *sde_enc, struct msm_display_dsc_info *dsc, unsigned long affected_displays, int index, const struct sde_rect *roi, int dsc_common_mode, - bool merge_3d, bool disable_merge_3d, bool mode_3d, + bool merge_3d, bool disable_merge_3d, enum sde_3d_blend_mode mode_3d, bool dsc_4hsmerge, bool half_panel_partial_update, int ich_res) { @@ -432,7 +432,7 @@ static int _dce_dsc_setup_helper(struct sde_encoder_virt *sde_enc, dsc_merge = ((num_dsc > num_intf) && !dsc->half_panel_pu) ? true : false; disable_merge_3d = (merge_3d && dsc->half_panel_pu) ? - false : true; + true : false; dsc_4hsmerge = (dsc_merge && num_dsc == 4 && num_intf == 1) ? true : false;