evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: mdss: handle programming of MDP_HDMI_DP_CORE_SELECT register"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-26 23:48:17 -08:00 • committed by Gerrit - the friendly Code Review server
commit 87d4a67314
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/video/fbdev/msm/mdss_mdp_intf_video.c
View file

@ -1896,7 +1896,6 @@ static int mdss_mdp_video_ctx_setup(struct mdss_mdp_ctl *ctl,
struct mdss_mdp_format_params *fmt; struct mdss_mdp_format_params *fmt;
struct mdss_data_type *mdata = ctl->mdata; struct mdss_data_type *mdata = ctl->mdata;
struct dsc_desc *dsc = NULL; struct dsc_desc *dsc = NULL;
u32 hdmi_dp_core;
ctx->ctl = ctl; ctx->ctl = ctl;
ctx->intf_type = ctl->intf_type; 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); mdp_video_write(ctx, MDSS_MDP_REG_INTF_PANEL_FORMAT, ctl->dst_format);
hdmi_dp_core = (ctx->intf_type == MDSS_INTF_EDP) ? 1 : 0; /* select HDMI or DP core usage */
switch (ctx->intf_type) {
writel_relaxed(hdmi_dp_core, mdata->mdp_base + case MDSS_INTF_EDP:
writel_relaxed(0x1, mdata->mdp_base +
MDSS_MDP_HDMI_DP_CORE_SELECT); 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; return 0;
} }