Merge "msm: vidc: skip init clock and bus data entry for cvp session" (e49c3a57) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -980,6 +980,12 @@ int msm_comm_init_clocks_and_bus_data(struct msm_vidc_inst *inst)
		__func__, inst);
		return -EINVAL;
		}

		if (inst->session_type == MSM_VIDC_CVP) {
		dprintk(VIDC_DBG, "%s: cvp session\n", __func__);
		return 0;
		}

		count = inst->core->resources.codec_data_count;
		fourcc = inst->session_type == MSM_VIDC_DECODER ?
		inst->fmts[OUTPUT_PORT].fourcc :