Merge "msm: mdss: Returning generic error code on overlay scaling hw limitation" (06aafcab) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_overlay.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -529,10 +529,12 @@ static int __mdss_mdp_overlay_setup_scaling(struct mdss_mdp_pipe *pipe)
	if ((rc == -EOVERFLOW) && (pipe->type == MDSS_MDP_PIPE_TYPE_VIG)) {		if ((rc == -EOVERFLOW) && (pipe->type == MDSS_MDP_PIPE_TYPE_VIG)) {
	/* overflow on Qseed2 scaler is acceptable */		/* overflow on Qseed2 scaler is acceptable */
	rc = 0;		rc = 0;
			} else if (rc == -EOVERFLOW) {
			/* overflow expected and should fallback to GPU */
			rc = -ECANCELED;
	} else if (rc) {		} else if (rc) {
	pr_err("Vertical scaling calculation failed=%d! %d->%d\n",		pr_err("Vertical scaling calculation failed=%d! %d->%d\n",
	rc, src, pipe->dst.h);		rc, src, pipe->dst.h);
	return rc;
	}		}
	return rc;		return rc;
	}		}