From 6575366a16a38981b9a302617b02ebf3cecad42d Mon Sep 17 00:00:00 2001 From: Veera Sundaram Sankaran Date: Tue, 12 May 2020 16:12:37 -0700 Subject: [PATCH 1/2] disp: msm: sde: fix possible null pointer dereference Fix a possible uninitialized variable usage in sde catalog and a null pointer dereference in sde crtc. Change-Id: I4299ade65fa7cf5bfc3d60d6d7a368d523286626 Signed-off-by: Veera Sundaram Sankaran --- msm/sde/sde_crtc.c | 3 ++- msm/sde/sde_hw_catalog.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/msm/sde/sde_crtc.c b/msm/sde/sde_crtc.c index 0d2c27badc..e8c77ac1f4 100644 --- a/msm/sde/sde_crtc.c +++ b/msm/sde/sde_crtc.c @@ -1299,7 +1299,8 @@ static void _sde_crtc_set_src_split_order(struct drm_crtc *crtc, prv_pstate = (i > 0) ? &pstates[i - 1] : NULL; cur_pstate = &pstates[i]; nxt_pstate = ((i + 1) < cnt) ? &pstates[i + 1] : NULL; - prev_layout = prv_pstate->sde_pstate->layout; + prev_layout = prv_pstate ? prv_pstate->sde_pstate->layout : + SDE_LAYOUT_NONE; cur_layout = cur_pstate->sde_pstate->layout; if ((!prv_pstate) || (prv_pstate->stage != cur_pstate->stage) diff --git a/msm/sde/sde_hw_catalog.c b/msm/sde/sde_hw_catalog.c index 0e7fd0dd6b..f8e94c6b0d 100644 --- a/msm/sde/sde_hw_catalog.c +++ b/msm/sde/sde_hw_catalog.c @@ -3010,6 +3010,7 @@ static int sde_vdc_parse_dt(struct device_node *np, rc = 0; } else { SDE_ERROR("invalid vdc configuration\n"); + goto end; } rc = _read_dt_entry(np, vdc_prop, ARRAY_SIZE(vdc_prop), prop_count, From b38271907792e7de243c2b382caacfcce6515fd2 Mon Sep 17 00:00:00 2001 From: Veera Sundaram Sankaran Date: Fri, 17 Apr 2020 12:40:40 -0700 Subject: [PATCH 2/2] disp: msm: sde: avoid disabling dsc encoder in PP block DSC encoder block disables the right DSC block on pingpong for right-only or left-only partial update frame trigger after a full frame update. This would cause issue with posted-start feature as the register is not double buffered. Avoid disabling in PingPong block as the DSC encoder being used can be controlled by the DSC common_mode setting. Change-Id: I20791b925c1a6f8694673e2f8d43e5283305c131 Signed-off-by: Veera Sundaram Sankaran --- msm/sde/sde_encoder_dce.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/msm/sde/sde_encoder_dce.c b/msm/sde/sde_encoder_dce.c index 0226ceb4b5..5ce827346f 100644 --- a/msm/sde/sde_encoder_dce.c +++ b/msm/sde/sde_encoder_dce.c @@ -200,10 +200,17 @@ static void _dce_dsc_pipe_cfg(struct sde_hw_dsc *hw_dsc, u32 common_mode, bool ich_reset, struct sde_hw_pingpong *hw_dsc_pp, enum sde_3d_blend_mode mode_3d, - bool disable_merge_3d, bool enable) + bool disable_merge_3d, bool enable, + bool half_panel_partial_update) { if (!enable) { - if (hw_dsc_pp && hw_dsc_pp->ops.disable_dsc) + /* + * avoid disabling dsc encoder in pp-block as it is + * not double-buffered and is not required to be disabled + * for half panel updates + */ + if (hw_dsc_pp && hw_dsc_pp->ops.disable_dsc + && !half_panel_partial_update) hw_dsc_pp->ops.disable_dsc(hw_dsc_pp); if (hw_dsc && hw_dsc->ops.dsc_disable) @@ -342,7 +349,8 @@ static int _dce_dsc_setup_single(struct sde_encoder_virt *sde_enc, index, active, merge_3d, disable_merge_3d); _dce_dsc_pipe_cfg(hw_dsc, hw_pp, dsc, dsc_common_mode, ich_res, - hw_dsc_pp, mode_3d, disable_merge_3d, active); + hw_dsc_pp, mode_3d, disable_merge_3d, active, + half_panel_partial_update); memset(&cfg, 0, sizeof(cfg)); cfg.dsc[cfg.dsc_count++] = hw_dsc->idx; @@ -711,7 +719,7 @@ static void _dce_dsc_disable(struct sde_encoder_virt *sde_enc) _dce_dsc_pipe_cfg(hw_dsc, hw_pp, NULL, 0, 0, hw_dsc_pp, - BLEND_3D_NONE, false, false); + BLEND_3D_NONE, false, false, false); if (hw_dsc) { sde_enc->dirty_dsc_ids[i] = hw_dsc->idx;