summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTerence Hampson <thampson@codeaurora.org>2014-02-24 15:25:23 -0500
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 20:27:18 -0700
commit6615c80786fae256b9c7e2b342eeedeaea341850 (patch)
tree2b6a47bfdaa1ea86850b9e61a508f0921c7ba74e
parent7e681dce07678b0e17a0cc10ac4da39a48796441 (diff)
mdss: mdp3: fix logic when verifying is image can be scaled by 1
There was an issue where images that could be scaled by 1 were not being blit by ppp due to logic error. Change-Id: I6f8cdf43d5398a7894e5b7f8a867ec59341345b8 Signed-off-by: Terence Hampson <thampson@codeaurora.org>
-rw-r--r--drivers/video/fbdev/msm/mdp3_ppp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/fbdev/msm/mdp3_ppp.c b/drivers/video/fbdev/msm/mdp3_ppp.c
index 78746329202c..77198f1fe00c 100644
--- a/drivers/video/fbdev/msm/mdp3_ppp.c
+++ b/drivers/video/fbdev/msm/mdp3_ppp.c
@@ -867,17 +867,17 @@ int mdp3_ppp_start_blit(struct msm_fb_data_type *mfd,
if (req->flags & MDP_ROT_90) {
if (((req->dst_rect.h == 1) && ((req->src_rect.w != 1) ||
- (req->dst_rect.w != req->src_rect.h))) ||
+ (req->dst_rect.w == req->src_rect.h))) ||
((req->dst_rect.w == 1) && ((req->src_rect.h != 1) ||
- (req->dst_rect.h != req->src_rect.w)))) {
+ (req->dst_rect.h == req->src_rect.w)))) {
pr_err("mdp_ppp: error scaling when size is 1!\n");
return -EINVAL;
}
} else {
if (((req->dst_rect.w == 1) && ((req->src_rect.w != 1) ||
- (req->dst_rect.h != req->src_rect.h))) ||
+ (req->dst_rect.h == req->src_rect.h))) ||
((req->dst_rect.h == 1) && ((req->src_rect.h != 1) ||
- (req->dst_rect.w != req->src_rect.w)))) {
+ (req->dst_rect.w == req->src_rect.w)))) {
pr_err("mdp_ppp: error scaling when size is 1!\n");
return -EINVAL;
}