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

msm: mdss: Properly set the PP feature cfg_payload in layers

Browse source 
Set the PP feature cfg_payload properly to avoid invalid pointer
cases.

CRs-Fixed: 1004933
Change-Id: I44314b49a6ebb5dedfdedfcddd88c12eabd1f125
Signed-off-by: Ping Li <pingli@codeaurora.org>
This commit is contained in:
Ping Li 2016-04-19 18:52:10 -07:00 • committed by Jeevan Shriram
parent 59775321c6
commit 2a62dcb194
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/video/fbdev/msm/mdss_mdp_pp.c
View file

@ -7170,6 +7170,8 @@ int mdss_mdp_copy_layer_pp_info(struct mdp_input_layer *layer)
pr_err("Failed to copy IGC payload, ret = %d\n", ret); pr_err("Failed to copy IGC payload, ret = %d\n", ret);
goto exit_pp_info; goto exit_pp_info;
} }
} else {
pp_info->igc_cfg.cfg_payload = NULL;
} }
if (ops & MDP_OVERLAY_PP_HIST_LUT_CFG) { if (ops & MDP_OVERLAY_PP_HIST_LUT_CFG) {
ret = pp_copy_layer_hist_lut_payload(pp_info); ret = pp_copy_layer_hist_lut_payload(pp_info);
@ -7178,6 +7180,8 @@ int mdss_mdp_copy_layer_pp_info(struct mdp_input_layer *layer)
ret); ret);
goto exit_igc; goto exit_igc;
} }
} else {
pp_info->hist_lut_cfg.cfg_payload = NULL;
} }
if (ops & MDP_OVERLAY_PP_PA_V2_CFG) { if (ops & MDP_OVERLAY_PP_PA_V2_CFG) {
ret = pp_copy_layer_pa_payload(pp_info); ret = pp_copy_layer_pa_payload(pp_info);
@ -7185,6 +7189,8 @@ int mdss_mdp_copy_layer_pp_info(struct mdp_input_layer *layer)
pr_err("Failed to copy PA payload, ret = %d\n", ret); pr_err("Failed to copy PA payload, ret = %d\n", ret);
goto exit_hist_lut; goto exit_hist_lut;
} }
} else {
pp_info->pa_v2_cfg_data.cfg_payload = NULL;
} }
if (ops & MDP_OVERLAY_PP_PCC_CFG) { if (ops & MDP_OVERLAY_PP_PCC_CFG) {
ret = pp_copy_layer_pcc_payload(pp_info); ret = pp_copy_layer_pcc_payload(pp_info);
@ -7192,6 +7198,8 @@ int mdss_mdp_copy_layer_pp_info(struct mdp_input_layer *layer)
pr_err("Failed to copy PCC payload, ret = %d\n", ret); pr_err("Failed to copy PCC payload, ret = %d\n", ret);
goto exit_pa; goto exit_pa;
} }
} else {
pp_info->pcc_cfg_data.cfg_payload = NULL;
} }
layer->pp_info = pp_info; layer->pp_info = pp_info;