Merge "drm/msm/sde: fix programming problem causing mdp hangs" into msm-4.14 (d53eb757) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -3930,7 +3930,8 @@ static int sde_plane_sspp_atomic_update(struct drm_plane *plane,
		pstate->multirect_mode);
		}

		if ((pstate->dirty & SDE_PLANE_DIRTY_FORMAT) &&
		if ((pstate->dirty & SDE_PLANE_DIRTY_FORMAT \|\|
		pstate->dirty & SDE_PLANE_DIRTY_RECTS) &&
		psde->pipe_hw->ops.setup_format) {
		src_flags = pstate->pipe_order_flags;
		SDE_DEBUG_PLANE(psde, "rotation 0x%X\n", rstate->out_rotation);