Merge "drm: msm: sde: fix decimation validation in plane atomic_check" (d77ce925) · Commits · e / devices / android_kernel_fairphone_FP3

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

+16 −11

Original line number	Original line	Diff line number	Diff line
	@@ -1088,6 +1088,12 @@ static void _sde_plane_setup_scaler3(struct sde_plane *psde,
	&& (src_w == dst_w))		&& (src_w == dst_w))
	return;		return;

			SDE_DEBUG_PLANE(psde,
			"setting bilinear: src:%dx%d dst:%dx%d chroma:%dx%d fmt:%x\n",
			src_w, src_h, dst_w, dst_h,
			chroma_subsmpl_v, chroma_subsmpl_h,
			fmt->base.pixel_format);

	scale_cfg->dst_width = dst_w;		scale_cfg->dst_width = dst_w;
	scale_cfg->dst_height = dst_h;		scale_cfg->dst_height = dst_h;
	scale_cfg->y_rgb_filter_cfg = SDE_SCALE_BIL;		scale_cfg->y_rgb_filter_cfg = SDE_SCALE_BIL;
	@@ -3574,17 +3580,16 @@ static int sde_plane_sspp_atomic_check(struct drm_plane *plane,
	ret = -EINVAL;		ret = -EINVAL;

	/* decimation validation */		/* decimation validation */
	} else if (deci_w \|\| deci_h) {		} else if ((deci_w \|\| deci_h)
	if ((deci_w > psde->pipe_sblk->maxhdeciexp) \|\|		&& ((deci_w > psde->pipe_sblk->maxhdeciexp)
	(deci_h > psde->pipe_sblk->maxvdeciexp)) {		\|\| (deci_h > psde->pipe_sblk->maxvdeciexp))) {
	SDE_ERROR_PLANE(psde,		SDE_ERROR_PLANE(psde, "too much decimation requested\n");
	"too much decimation requested\n");
	ret = -EINVAL;		ret = -EINVAL;
	} else if (fmt->fetch_mode != SDE_FETCH_LINEAR) {
	SDE_ERROR_PLANE(psde,		} else if ((deci_w \|\| deci_h)
	"decimation requires linear fetch\n");		&& (fmt->fetch_mode != SDE_FETCH_LINEAR)) {
			SDE_ERROR_PLANE(psde, "decimation requires linear fetch\n");
	ret = -EINVAL;		ret = -EINVAL;
	}

	} else if (!(psde->features & SDE_SSPP_SCALER) &&		} else if (!(psde->features & SDE_SSPP_SCALER) &&
	((src.w != dst.w) \|\| (src.h != dst.h))) {		((src.w != dst.w) \|\| (src.h != dst.h))) {