diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_video.c b/drivers/video/fbdev/msm/mdss_mdp_intf_video.c
index 663d63092ebf..5173567a3420 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_intf_video.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_intf_video.c
@@ -1896,7 +1896,6 @@ static int mdss_mdp_video_ctx_setup(struct mdss_mdp_ctl *ctl,
 	struct mdss_mdp_format_params *fmt;
 	struct mdss_data_type *mdata = ctl->mdata;
 	struct dsc_desc *dsc = NULL;
-	u32 hdmi_dp_core;
 
 	ctx->ctl = ctl;
 	ctx->intf_type = ctl->intf_type;
@@ -2033,10 +2032,19 @@ static int mdss_mdp_video_ctx_setup(struct mdss_mdp_ctl *ctl,
 
 	mdp_video_write(ctx, MDSS_MDP_REG_INTF_PANEL_FORMAT, ctl->dst_format);
 
-	hdmi_dp_core = (ctx->intf_type == MDSS_INTF_EDP) ? 1 : 0;
-
-	writel_relaxed(hdmi_dp_core, mdata->mdp_base +
+	/* select HDMI or DP core usage */
+	switch (ctx->intf_type) {
+	case MDSS_INTF_EDP:
+		writel_relaxed(0x1, mdata->mdp_base +
 			MDSS_MDP_HDMI_DP_CORE_SELECT);
+		break;
+	case MDSS_INTF_HDMI:
+		writel_relaxed(0x0, mdata->mdp_base +
+			MDSS_MDP_HDMI_DP_CORE_SELECT);
+		break;
+	default:
+		break;
+	}
 
 	return 0;
 }