On Fri, Apr 2, 2021 at 4:55 AM Kalyan Thota kalyan_t@codeaurora.org wrote:

Update the 3d merge as active in the data path only if the hw block is selected in the configuration.

Reported-by: Stephen Boyd swboyd@chromium.org

Thanks, I've added:

Fixes: 73bfb790ac78 ("msm:disp:dpu1: setup display datapath for SC7180 target")

Signed-off-by: Kalyan Thota kalyan_t@codeaurora.org

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c index 8981cfa..92e6f1b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -496,7 +496,9 @@ static void dpu_hw_ctl_intf_cfg_v1(struct dpu_hw_ctl *ctx,

    DPU_REG_WRITE(c, CTL_TOP, mode_sel);
    DPU_REG_WRITE(c, CTL_INTF_ACTIVE, intf_active);

•   DPU_REG_WRITE(c, CTL_MERGE_3D_ACTIVE, BIT(cfg->merge_3d - MERGE_3D_0));
  

•   if (cfg->merge_3d)
  

•           DPU_REG_WRITE(c, CTL_MERGE_3D_ACTIVE,
  

•                         BIT(cfg->merge_3d - MERGE_3D_0));
  

}

static void dpu_hw_ctl_intf_cfg(struct dpu_hw_ctl *ctx,

2.7.4