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

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

Merge "mdss: mdp: fix incorrect programming of scalar enable"

parents 0194e5b3 40a1dc71

drivers/video/msm/mdss/mdss_mdp_pp.c

+2 −2
Original line number Diff line number Diff line
@@ -1071,7 +1071,7 @@ static int mdss_mdp_scale_setup(struct mdss_mdp_pipe *pipe) 
	    (pipe->pp_res.pp_sts.sharp_sts & PP_STS_ENABLE) ||

	    (chroma_sample == MDSS_MDP_CHROMA_420) ||

	    (chroma_sample == MDSS_MDP_CHROMA_H1V2) ||

	    pipe->scale.enable_pxl_ext) {

	    (pipe->scale.enable_pxl_ext && (src_h != pipe->dst.h))) {

		pr_debug("scale y - src_h=%d dst_h=%d\n", src_h, pipe->dst.h);



		if ((src_h / MAX_DOWNSCALE_RATIO) > pipe->dst.h) {
@@ -1127,7 +1127,7 @@ static int mdss_mdp_scale_setup(struct mdss_mdp_pipe *pipe) 
	    (pipe->pp_res.pp_sts.sharp_sts & PP_STS_ENABLE) ||

	    (chroma_sample == MDSS_MDP_CHROMA_420) ||

	    (chroma_sample == MDSS_MDP_CHROMA_H2V1) ||

	    pipe->scale.enable_pxl_ext) {

	    (pipe->scale.enable_pxl_ext && (src_w != pipe->dst.w))) {

		pr_debug("scale x - src_w=%d dst_w=%d\n", src_w, pipe->dst.w);



		if ((src_w / MAX_DOWNSCALE_RATIO) > pipe->dst.w) {