From bc3dc4edf28fa0d308151cbc3bd6f5f0503cde71 Mon Sep 17 00:00:00 2001 From: UtsavBalar1231 Date: Mon, 22 Jun 2020 23:40:38 +0530 Subject: [PATCH] FIXUP: 76deb8e5d7e10eec1bfbf7a4177677a4fa67cf59: sde: fix a mismerge Signed-off-by: UtsavBalar1231 --- drivers/gpu/drm/msm/sde/sde_connector.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/msm/sde/sde_connector.c b/drivers/gpu/drm/msm/sde/sde_connector.c index 1f6158582336..8e41dbef7252 100644 --- a/drivers/gpu/drm/msm/sde/sde_connector.c +++ b/drivers/gpu/drm/msm/sde/sde_connector.c @@ -769,6 +769,12 @@ int sde_connector_update_hbm(struct sde_connector *c_conn) pr_debug("notify hbm on to displayfeature\n"); } + if (dsi_display->panel->dc_enable) { + dsi_display->panel->dc_enable = false; + pr_debug("fod set CRC OFF\n"); + dsi_display_write_panel(dsi_display, &dsi_display->panel->cur_mode->priv_info->cmd_sets[DSI_CMD_SET_DISP_CRC_OFF]); + } + if (dsi_display->panel->fod_dimlayer_bl_block) { dsi_display->panel->fod_dimlayer_bl_block = false; pr_debug("the fod_dimlayer_bl_block state is [%d]\n", dsi_display->panel->fod_dimlayer_bl_block);