Merge "msm: vidc: Fix setting 8x8 transforms" (626b6c2f) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/media/platform/msm/vidc/msm_venc.c

+9 −5

Original line number	Diff line number	Diff line
		@@ -3365,12 +3365,16 @@ int msm_venc_set_8x8_transform(struct msm_vidc_inst *inst)
		}
		hdev = inst->core->device;

		if (inst->fmts[CAPTURE_PORT].fourcc != V4L2_PIX_FMT_H264 &&
		inst->profile != HFI_H264_PROFILE_HIGH &&
		if (inst->fmts[CAPTURE_PORT].fourcc != V4L2_PIX_FMT_H264) {
		dprintk(VIDC_DBG, "%s: skip due to %#x\n",
		__func__, inst->fmts[CAPTURE_PORT].fourcc);
		return 0;
		}

		if (inst->profile != HFI_H264_PROFILE_HIGH &&
		inst->profile != HFI_H264_PROFILE_CONSTRAINED_HIGH) {
		dprintk(VIDC_DBG, "%s: skip due to %#x %#x\n",
		__func__, inst->fmts[CAPTURE_PORT].fourcc,
		inst->profile);
		dprintk(VIDC_DBG, "%s: skip due to %#x\n",
		__func__, inst->profile);
		return 0;
		}