Merge "drm/msm/sde: avoid enabling qseed3 with multirect" into dev/msm-4.14-display (7c90861d) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+3 −11

Original line number	Diff line number	Diff line
		@@ -1138,8 +1138,9 @@ static void _sde_plane_setup_scaler3(struct sde_plane *psde,
		pstate->pixel_ext.num_ext_pxls_left[i] =
		scale_cfg->src_width[i];
		}
		if (!(SDE_FORMAT_IS_YUV(fmt)) && (src_h == dst_h)
		&& (src_w == dst_w))

		if ((!(SDE_FORMAT_IS_YUV(fmt)) && (src_h == dst_h)
		&& (src_w == dst_w)) \|\| pstate->multirect_mode)
		return;

		scale_cfg->dst_width = dst_w;
		@@ -3015,15 +3016,6 @@ int sde_plane_validate_multirect_v2(struct sde_multirect_plane_states *plane)
		pstate[R1]->multirect_index = SDE_SSPP_RECT_1;
		};

		for (i = 0; i < R_MAX; i++) {
		if (pstate[i]->scaler3_cfg.enable) {
		SDE_ERROR_PLANE(sde_plane[i],
		"qseed3 with multirect not allowed, mode:%d\n",
		pstate[i]->multirect_mode);
		return -EINVAL;
		}
		}

		SDE_DEBUG_PLANE(sde_plane[R0], "R0: %d - %d\n",
		pstate[R0]->multirect_mode, pstate[R0]->multirect_index);
		SDE_DEBUG_PLANE(sde_plane[R1], "R1: %d - %d\n",