diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-28 00:46:31 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-28 00:46:31 -0800 |
| commit | f443e6b3803fd45fbba54ba5c7238c81c20b85ca (patch) | |
| tree | 53133662ff1f4be549a107510cc9470a95f4d21d | |
| parent | c8ec64b1cdf215937a39bd4548d169ff25fb066c (diff) | |
| parent | 04b1332144dd302bb1dc353f22071453621c4432 (diff) | |
Merge "msm: mdss: Choose the correct PPB for right only update in non-DSC mode"
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c b/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c index c249cac87b8a..5cbc23a713c2 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c +++ b/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -51,8 +51,10 @@ struct mdss_mdp_cmd_ctx { u32 current_pp_num; /* * aux_pp_num will be set only when topology is using split-lm. - * aux_pp_num will be used only when MDSS_QUIRK_DSC_RIGHT_ONLY_PU - * quirk is set and on following partial updates. + * aux_pp_num will be used + * if right-only update on DUAL_LM_SINGLE_DISPLAY with 3D Mux + * or if MDSS_QUIRK_DSC_RIGHT_ONLY_PU quirk is set + * and on following partial updates. * * right-only update on DUAL_LM_SINGLE_DISPLAY with DSC_MERGE * right-only update on DUAL_LM_DUAL_DISPLAY with DSC @@ -119,14 +121,32 @@ static int mdss_mdp_setup_vsync(struct mdss_mdp_cmd_ctx *ctx, bool enable); static bool __mdss_mdp_cmd_is_aux_pp_needed(struct mdss_data_type *mdata, struct mdss_mdp_ctl *mctl) { - return (mdata && mctl && mctl->is_master && - mdss_has_quirk(mdata, MDSS_QUIRK_DSC_RIGHT_ONLY_PU) && - is_dsc_compression(&mctl->panel_data->panel_info) && - ((mctl->mfd->split_mode == MDP_DUAL_LM_DUAL_DISPLAY) || - ((mctl->mfd->split_mode == MDP_DUAL_LM_SINGLE_DISPLAY) && - (mctl->panel_data->panel_info.dsc_enc_total == 1))) && - !mctl->mixer_left->valid_roi && - mctl->mixer_right->valid_roi); + bool mux3d, merge, quirk, rightonly; + + if (!mdata || !mctl || !mctl->is_master) + return false; + + /* + * aux_pp_num will be used: + * if right-only update on DUAL_LM_SINGLE_DISPLAY with 3D Mux + * or if MDSS_QUIRK_DSC_RIGHT_ONLY_PU quirk is set + * and on following partial updates. + * + * right-only update on DUAL_LM_SINGLE_DISPLAY with DSC_MERGE + * right-only update on DUAL_LM_DUAL_DISPLAY with DSC + */ + mux3d = ((mctl->mfd->split_mode == MDP_DUAL_LM_SINGLE_DISPLAY) && + (mctl->opmode & MDSS_MDP_CTL_OP_PACK_3D_ENABLE)); + merge = ((mctl->mfd->split_mode == MDP_DUAL_LM_SINGLE_DISPLAY) && + (mctl->panel_data->panel_info.dsc_enc_total == 1)); + quirk = (mdss_has_quirk(mdata, MDSS_QUIRK_DSC_RIGHT_ONLY_PU) && + is_dsc_compression(&mctl->panel_data->panel_info) && + ((mctl->mfd->split_mode == MDP_DUAL_LM_DUAL_DISPLAY) || + merge)); + rightonly = !mctl->mixer_left->valid_roi && + mctl->mixer_right->valid_roi; + + return ((mux3d || quirk) && rightonly); } static bool __mdss_mdp_cmd_is_panel_power_off(struct mdss_mdp_cmd_ctx *ctx) |