Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a360dc1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: avoid adding plane states in crtc atomic check"

parents e1fb82e2 a198b6cd
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -1134,12 +1134,12 @@ static int sde_crtc_atomic_check(struct drm_crtc *crtc,

	 /* get plane state for all drm planes associated with crtc state */
	drm_atomic_crtc_state_for_each_plane(plane, state) {
		pstate = drm_atomic_get_plane_state(state->state, plane);
		pstate = drm_atomic_get_existing_plane_state(
				state->state, plane);
		if (IS_ERR_OR_NULL(pstate)) {
			rc = PTR_ERR(pstate);
			SDE_ERROR("%s: failed to get plane%d state, %d\n",
			SDE_DEBUG("%s: failed to get plane%d state, %d\n",
					sde_crtc->name, plane->base.id, rc);
			goto end;
			continue;
		}
		if (cnt >= ARRAY_SIZE(pstates))
			continue;