From 6d5c46be580d760e7b83aa6cebc1f4d930ac9d99 Mon Sep 17 00:00:00 2001 From: Terence Hampson Date: Tue, 3 Jun 2014 18:00:03 -0400 Subject: [PATCH] mdss: mdp3: Remove scaling by 1 for ppp composition Scaling by 1 logic was complicated. After trying to understand what use cases we were preventing with this check, we verified that ppp is actually able to handle scaling by 1 with hw team. There is no need for this check. Change-Id: I9f3cda5e61740fffdbda92dc768a98796b9a8238 Signed-off-by: Terence Hampson --- drivers/video/fbdev/msm/mdp3_ppp.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/video/fbdev/msm/mdp3_ppp.c b/drivers/video/fbdev/msm/mdp3_ppp.c index 5d8f7b6981df..474bc37d133b 100644 --- a/drivers/video/fbdev/msm/mdp3_ppp.c +++ b/drivers/video/fbdev/msm/mdp3_ppp.c @@ -865,24 +865,6 @@ int mdp3_ppp_start_blit(struct msm_fb_data_type *mfd, if (unlikely(req->dst_rect.h == 0 || req->dst_rect.w == 0)) return 0; - 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 == 1) && ((req->src_rect.h != 1) || - (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 == 1) && ((req->src_rect.h != 1) || - (req->dst_rect.w == req->src_rect.w)))) { - pr_err("mdp_ppp: error scaling when size is 1!\n"); - return -EINVAL; - } - } - /* MDP width split workaround */ remainder = (req->dst_rect.w) % 16; ret = ppp_get_bpp(req->dst.format, mfd->fb_imgType);