Merge "drm/msm/sde: prevent clearing multirect flags during validate failure" (68c334f9) · Commits · e / devices / android_kernel_fairphone_FP3

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -4699,8 +4699,6 @@ static int sde_crtc_atomic_check(struct drm_crtc *crtc,

		for (i = 1; i < SSPP_MAX; i++) {
		if (pipe_staged[i]) {
		sde_plane_clear_multirect(pipe_staged[i]);

		if (is_sde_plane_virtual(pipe_staged[i]->plane)) {
		SDE_ERROR(
		"r1 only virt plane:%d not supported\n",
		@@ -4708,6 +4706,7 @@ static int sde_crtc_atomic_check(struct drm_crtc *crtc,
		rc = -EINVAL;
		goto end;
		}
		sde_plane_clear_multirect(pipe_staged[i]);
		}
		}