diff options
| author | Adrian Salido-Moreno <adrianm@codeaurora.org> | 2014-10-31 22:02:54 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:35:50 -0700 |
| commit | 1f09285af58262ff2a1d8f46caec50e9c6002d28 (patch) | |
| tree | e38d6a5681d1b9da3521788367d7c42c77948e78 /drivers | |
| parent | eca18cc3448a7663f9279889372d720550fd155c (diff) | |
msm: mdss: fix check for bwc and decimation
Decimation flag is not sufficient to prevent decimation from being
enabled. Instead check that decimation values are also not set.
Change-Id: Iab5fb4ef96649a2f28f4203643856b9ab9df4bee
Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_overlay.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_overlay.c b/drivers/video/fbdev/msm/mdss_mdp_overlay.c index aa399ffc30b4..fb12551674d7 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_overlay.c +++ b/drivers/video/fbdev/msm/mdss_mdp_overlay.c @@ -341,12 +341,15 @@ int mdss_mdp_overlay_req_check(struct msm_fb_data_type *mfd, if (req->flags & MDP_BWC_EN) { if ((req->src.width != req->src_rect.w) || (req->src.height != req->src_rect.h)) { - pr_err("BWC: unequal src img and rect w,h\n"); + pr_err("BWC: mismatch of src img=%dx%d rect=%dx%d\n", + req->src.width, req->src.height, + req->src_rect.w, req->src_rect.h); return -EINVAL; } - if (req->flags & MDP_DECIMATION_EN) { - pr_err("Can't enable BWC decode && decimate\n"); + if ((req->flags & MDP_DECIMATION_EN) || + req->vert_deci || req->horz_deci) { + pr_err("Can't enable BWC and decimation\n"); return -EINVAL; } } |