Merge "drm/msm/sde: validate framebuffer layout during prepare_fb" (d6a3815a) · Commits · e / devices / android_kernel_fairphone_FP3

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -2595,6 +2595,7 @@ static int sde_plane_prepare_fb(struct drm_plane *plane,
		struct drm_framebuffer *fb = new_state->fb;
		struct sde_plane *psde = to_sde_plane(plane);
		struct sde_plane_rot_state *new_rstate;
		struct sde_hw_fmt_layout layout;
		int ret;

		if (!new_state->fb)
		@@ -2616,6 +2617,14 @@ static int sde_plane_prepare_fb(struct drm_plane *plane,
		return ret;
		}

		/* validate framebuffer layout before commit */
		ret = sde_format_populate_layout(new_rstate->mmu_id,
		new_rstate->out_fb, &layout);
		if (ret) {
		SDE_ERROR_PLANE(psde, "failed to get format layout, %d\n", ret);
		return ret;
		}

		return 0;
		}