Merge "drm/msm/sde: validate de-interlace and scalar concurrency" into dev/msm-4.14-display (4f40fe53) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/msm/sde/sde_plane.c

+19 −0

Original line number	Diff line number	Diff line
		@@ -3452,6 +3452,25 @@ static int _sde_plane_validate_scaler_v2(struct sde_plane *psde,
		src_w, src_h);
		return -EINVAL;
		}

		/*
		* SSPP fetch , unpack output and QSEED3 input lines need
		* to match for Y plane
		*/
		if (i == 0 &&
		(sde_plane_get_property(pstate, PLANE_PROP_SRC_CONFIG) &
		BIT(SDE_DRM_DEINTERLACE)) &&
		((pstate->scaler3_cfg.src_height[i] != (src_h/2)) \|\|
		(pstate->pixel_ext.roi_h[i] != (src_h/2)))) {
		SDE_ERROR_PLANE(psde,
		"de-interlace fail roi[%d] %d/%d, src %dx%d, src %dx%d\n",
		i, pstate->pixel_ext.roi_w[i],
		pstate->pixel_ext.roi_h[i],
		pstate->scaler3_cfg.src_width[i],
		pstate->scaler3_cfg.src_height[i],
		src_w, src_h);
		return -EINVAL;
		}
		}

		pstate->scaler_check_state = SDE_PLANE_SCLCHECK_SCALER_V2;