Merge "msm: vidc: Fix under vote issue in multi session usecase" (447d816a) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -241,8 +241,7 @@ int msm_comm_vote_bus(struct msm_vidc_core *core)
		list_for_each_entry_safe(temp, next,
		&inst->registeredbufs.list, list) {
		if (temp->vvb.vb2_buf.type ==
		V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE &&
		temp->flags & MSM_VIDC_FLAG_DEFERRED) {
		V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
		filled_len = max(filled_len,
		temp->vvb.vb2_buf.planes[0].bytesused);
		device_addr = temp->smem[0].device_addr;
		@@ -257,7 +256,8 @@ int msm_comm_vote_bus(struct msm_vidc_core *core)

		if ((!filled_len \|\| !device_addr) &&
		(inst->session_type != MSM_VIDC_CVP)) {
		dprintk(VIDC_DBG, "%s No ETBs\n", __func__);
		dprintk(VIDC_DBG, "%s: no input for session %x\n",
		__func__, hash32_ptr(inst->session));
		continue;
		}

		@@ -920,8 +920,7 @@ int msm_comm_scale_clocks(struct msm_vidc_inst *inst)
		mutex_lock(&inst->registeredbufs.lock);
		list_for_each_entry_safe(temp, next, &inst->registeredbufs.list, list) {
		if (temp->vvb.vb2_buf.type ==
		V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE &&
		temp->flags & MSM_VIDC_FLAG_DEFERRED) {
		V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
		filled_len = max(filled_len,
		temp->vvb.vb2_buf.planes[0].bytesused);
		if (inst->session_type == MSM_VIDC_ENCODER &&
		@@ -935,7 +934,8 @@ int msm_comm_scale_clocks(struct msm_vidc_inst *inst)
		mutex_unlock(&inst->registeredbufs.lock);

		if (!filled_len \|\| !device_addr) {
		dprintk(VIDC_DBG, "%s No ETBs\n", __func__);
		dprintk(VIDC_DBG, "%s no input for session %x\n",
		__func__, hash32_ptr(inst->session));
		goto no_clock_change;
		}