Merge "msm: vidc: Fix tile alignment of buffer for some resolution" (ca3db41a) · Commits · e / devices / android_kernel_fairphone_FP3

include/uapi/media/msm_media_info.h

+10 −4

Original line number	Diff line number	Diff line
		@@ -1261,8 +1261,11 @@ static inline unsigned int VENUS_BUFFER_SIZE(
		size = MSM_MEDIA_ALIGN(size, 4096);

		/* Additional size to cover last row of non-aligned frame */
		size += MSM_MEDIA_ALIGN(width, w_alignment) * w_alignment;
		if (width >= 2400 && height >= 2400) {
		size += MSM_MEDIA_ALIGN(width, w_alignment) *
		w_alignment;
		size = MSM_MEDIA_ALIGN(size, 4096);
		}
		break;
		case COLOR_FMT_P010:
		uv_alignment = 4096;
		@@ -1302,8 +1305,11 @@ static inline unsigned int VENUS_BUFFER_SIZE(
		size = MSM_MEDIA_ALIGN(size, 4096);

		/* Additional size to cover last row of non-aligned frame */
		size += MSM_MEDIA_ALIGN(width, w_alignment) * w_alignment;
		if (width >= 2400 && height >= 2400) {
		size += MSM_MEDIA_ALIGN(width, w_alignment) *
		w_alignment;
		size = MSM_MEDIA_ALIGN(size, 4096);
		}
		break;
		case COLOR_FMT_NV12_BPP10_UBWC:
		y_ubwc_plane = MSM_MEDIA_ALIGN(y_stride * y_sclines, 4096);