From f39844ecb67f7c56ce12567db90f423718ecd0ed Mon Sep 17 00:00:00 2001 From: Naseer Ahmed <naseer@codeaurora.org> Date: Thu, 11 Jun 2015 21:22:33 -0400 Subject: [PATCH] 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> Signed-off-by: Naseer Ahmed <naseer@codeaurora.org> --- drivers/video/msm/mdss/mdss_mdp_overlay.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/video/msm/mdss/mdss_mdp_overlay.c b/drivers/video/msm/mdss/mdss_mdp_overlay.c index e8315ce24a45..8ae6edb75ca6 100644 --- a/drivers/video/msm/mdss/mdss_mdp_overlay.c +++ b/drivers/video/msm/mdss/mdss_mdp_overlay.c @@ -182,12 +182,15 @@ static 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; } } -- GitLab