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

Commit 877d0369 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: fix logic when verifying is image can be scaled by 1"

parents 1e2b2fc9 80863703

drivers/video/msm/mdss/mdp3_ppp.c

+4 −4
Original line number Diff line number Diff line
@@ -865,17 +865,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;

		}