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

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

Merge "msm: mdss: rotator: return dst format for request match optimization"

parents 0935de5b 32824640

drivers/video/msm/mdss/mdss_mdp_rotator.c

+12 −2
Original line number Diff line number Diff line
@@ -810,10 +810,11 @@ static int mdss_mdp_rotator_config(struct msm_fb_data_type *mfd, 
	if (rot->flags & MDP_ROT_90)

		swap(rot->dst.w, rot->dst.h);



	rot->req_data = *req;



	req->src.format = mdss_mdp_get_rotator_dst_format(req->src.format,

		req->flags & MDP_ROT_90, req->flags & MDP_BWC_EN);



	rot->req_data = *req;

	rot->params_changed++;



	return 0;
@@ -895,8 +896,17 @@ static int mdss_mdp_rotator_config_ex(struct msm_fb_data_type *mfd, 
	}



	/* if session hasn't changed, skip reconfiguration */

	if (!memcmp(req, &rot->req_data, sizeof(*req)))

	if (!memcmp(req, &rot->req_data, sizeof(*req))) {

		/*

		 * as per the IOCTL spec, every successful rotator setup

		 * needs to return corresponding destination format.

		 */

		req->src.format = mdss_mdp_get_rotator_dst_format(

			req->src.format, req->flags & MDP_ROT_90,

			req->flags & MDP_BWC_EN);



		return 0;

	}



	flush_work(&rot->commit_work);