Merge "msm: vidc: flush dynamic output buffers in reconfig" (445b7727) · Commits · e / devices / android_kernel_sony_msm8994

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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2985,6 +2985,7 @@ int msm_comm_flush(struct msm_vidc_inst *inst, u32 flags)
	}		}

	mutex_lock(&inst->sync_lock);		mutex_lock(&inst->sync_lock);
			msm_comm_flush_dynamic_buffers(inst);
	if (inst->in_reconfig && !ip_flush && op_flush) {		if (inst->in_reconfig && !ip_flush && op_flush) {
	if (!list_empty(&inst->pendingq)) {		if (!list_empty(&inst->pendingq)) {
	/*Execution can never reach here since port reconfig		/*Execution can never reach here since port reconfig
	@@ -3022,8 +3023,6 @@ int msm_comm_flush(struct msm_vidc_inst *inst, u32 flags)
	}		}
	}		}

	msm_comm_flush_dynamic_buffers(inst);

	/Do not send flush in case of session_error /		/Do not send flush in case of session_error /
	if (!(inst->state == MSM_VIDC_CORE_INVALID &&		if (!(inst->state == MSM_VIDC_CORE_INVALID &&
	core->state != VIDC_CORE_INVALID))		core->state != VIDC_CORE_INVALID))