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

Merge "msm: mdss: Correct error handling in MDSS driver"

Browse source
This commit is contained in:
Linux Build Service Account 2016-09-24 02:00:51 -07:00 • committed by Gerrit - the friendly Code Review server
commit 97208825ec
2 changed files with 10 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.c
View file

@ -3384,14 +3384,17 @@ static int mdss_mdp_parse_dt_pipe(struct platform_device *pdev)
mdata->has_panic_ctrl = of_property_read_bool(pdev->dev.of_node,
"qcom,mdss-has-panic-ctrl");
if (mdata->has_panic_ctrl) {
mdss_mdp_parse_dt_pipe_panic_ctrl(pdev,
"qcom,mdss-pipe-vig-panic-ctrl-offsets",
if (mdata->vig_pipes)
mdss_mdp_parse_dt_pipe_panic_ctrl(pdev,
"qcom,mdss-pipe-vig-panic-ctrl-offsets",
mdata->vig_pipes, mdata->nvig_pipes);
mdss_mdp_parse_dt_pipe_panic_ctrl(pdev,
"qcom,mdss-pipe-rgb-panic-ctrl-offsets",
if (mdata->rgb_pipes)
mdss_mdp_parse_dt_pipe_panic_ctrl(pdev,
"qcom,mdss-pipe-rgb-panic-ctrl-offsets",
mdata->rgb_pipes, mdata->nrgb_pipes);
mdss_mdp_parse_dt_pipe_panic_ctrl(pdev,
"qcom,mdss-pipe-dma-panic-ctrl-offsets",
if (mdata->dma_pipes)
mdss_mdp_parse_dt_pipe_panic_ctrl(pdev,
"qcom,mdss-pipe-dma-panic-ctrl-offsets",
mdata->dma_pipes, mdata->ndma_pipes);
}

2
drivers/video/fbdev/msm/mdss_mdp_wfd.c
View file

@ -430,7 +430,7 @@ int mdss_mdp_cwb_validate(struct msm_fb_data_type *mfd,
return rc;
fmt = mdss_mdp_get_format_params(layer->buffer.format);
if (!(fmt->flag & VALID_MDP_WB_INTF_FORMAT)) {
if (!fmt || (fmt && !(fmt->flag & VALID_MDP_WB_INTF_FORMAT))) {
pr_err("wb does not support dst fmt:%d\n",
layer->buffer.format);
return -EINVAL;