Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd25dd7f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mdss: mdp3: Remove scaling by 1 for ppp composition"

parents 98fc74a7 c0862969

drivers/video/msm/mdss/mdp3_ppp.c

+0 −18
Original line number Diff line number Diff line
@@ -863,24 +863,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);