diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-29 11:34:48 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-29 11:34:48 -0700 |
| commit | e06e098ca3846d151d4de2960edf1c75702f5455 (patch) | |
| tree | 6d6bb800559048f09548c7fee1839f9b6996e3cc | |
| parent | b1db0d66cf5c5dd03514e6c29b1b237e7f2ed0b0 (diff) | |
| parent | e3811794b81c4dbb28674d1a5368cf7a68a5fd90 (diff) | |
Merge "msm: mdss: Allow post-processing clean-up for primary display"
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_pp.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pp.c b/drivers/video/fbdev/msm/mdss_mdp_pp.c index 0d8811e26c29..9c2b1d42bd35 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_pp.c +++ b/drivers/video/fbdev/msm/mdss_mdp_pp.c @@ -3264,6 +3264,8 @@ int mdss_mdp_pp_overlay_init(struct msm_fb_data_type *mfd) pr_err("Invalid mfd %pK mdata %pK\n", mfd, mdata); return -EPERM; } + if (mfd->index >= (MDP_BLOCK_MAX - MDP_LOGICAL_BLOCK_DISP_0)) + return 0; if (mdata->nad_cfgs) mfd->mdp.ad_calc_bl = pp_ad_calc_bl; @@ -7641,6 +7643,13 @@ static int pp_mfd_release_all(struct msm_fb_data_type *mfd) { struct mdss_data_type *mdata = mdss_mdp_get_mdata(); int ret = 0; + if (!mfd || !mdata) { + pr_err("Invalid mfd %pK mdata %pK\n", mfd, mdata); + return -EPERM; + } + + if (mfd->index >= (MDP_BLOCK_MAX - MDP_LOGICAL_BLOCK_DISP_0)) + return ret; if (mdata->nad_cfgs) { ret = pp_mfd_ad_release_all(mfd); |