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

Merge "msm: mdss: Fix 3D Mux when restoring from DSC on/off"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-06 04:23:40 -08:00 • committed by Gerrit - the friendly Code Review server
commit bac30a06da
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/video/fbdev/msm/mdss_mdp_ctl.c
View file

@ -3614,6 +3614,7 @@ int mdss_mdp_ctl_setup(struct mdss_mdp_ctl *ctl)
u32 width, height; u32 width, height;
int split_fb, rc = 0; int split_fb, rc = 0;
u32 max_mixer_width; u32 max_mixer_width;
bool dsc_merge_enabled = 0;
struct mdss_panel_info *pinfo; struct mdss_panel_info *pinfo;
if (!ctl || !ctl->panel_data) { if (!ctl || !ctl->panel_data) {
@ -3738,15 +3739,15 @@ int mdss_mdp_ctl_setup(struct mdss_mdp_ctl *ctl)
ctl->mixer_right = NULL; ctl->mixer_right = NULL;
} }
if (ctl->mixer_right) { dsc_merge_enabled = is_dsc_compression(pinfo) &&
if (!is_dsc_compression(pinfo) || (pinfo->dsc_enc_total == 2);
(pinfo->dsc_enc_total == 1))
ctl->opmode |= MDSS_MDP_CTL_OP_PACK_3D_ENABLE | if (ctl->mixer_right && (!dsc_merge_enabled))
MDSS_MDP_CTL_OP_PACK_3D_H_ROW_INT; ctl->opmode |= MDSS_MDP_CTL_OP_PACK_3D_ENABLE |
} else { MDSS_MDP_CTL_OP_PACK_3D_H_ROW_INT;
else
ctl->opmode &= ~(MDSS_MDP_CTL_OP_PACK_3D_ENABLE | ctl->opmode &= ~(MDSS_MDP_CTL_OP_PACK_3D_ENABLE |
MDSS_MDP_CTL_OP_PACK_3D_H_ROW_INT); MDSS_MDP_CTL_OP_PACK_3D_H_ROW_INT);
}
return 0; return 0;
} }