Merge "msm: vidc: handle dynamic buffers in pendingq during flush" (76e4402c) · Commits · e / devices / android_kernel_sony_msm8994

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

+36 −0

Original line number	Diff line number	Diff line
		@@ -3868,6 +3868,40 @@ void msm_comm_flush_dynamic_buffers(struct msm_vidc_inst *inst)
		mutex_unlock(&inst->lock);
		}

		void msm_comm_flush_pending_dynamic_buffers(struct msm_vidc_inst *inst)
		{
		struct buffer_info *binfo = NULL;
		struct list_head *list = NULL;

		if (!inst)
		return;

		if (inst->buffer_mode_set[CAPTURE_PORT] != HAL_BUFFER_MODE_DYNAMIC)
		return;

		if (list_empty(&inst->pendingq) \|\| list_empty(&inst->registered_bufs))
		return;

		list = &inst->registered_bufs;

		/*
		* Dynamic Buffer mode - Since pendingq is not empty
		* no output buffers have been sent to firmware yet.
		* Hence remove reference to all pendingq o/p buffers
		* before flushing them.
		*/

		list_for_each_entry(binfo, list, list) {
		if (binfo && binfo->type ==
		V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
		dprintk(VIDC_DBG,
		"%s: binfo = %p device_addr = 0x%pa\n",
		__func__, binfo, &binfo->device_addr[0]);
		buf_ref_put(inst, binfo);
		}
		}
		}

		int msm_comm_flush(struct msm_vidc_inst *inst, u32 flags)
		{
		int rc = 0;
		@@ -3933,6 +3967,8 @@ int msm_comm_flush(struct msm_vidc_inst *inst, u32 flags)

		} else {
		if (!list_empty(&inst->pendingq)) {
		msm_comm_flush_pending_dynamic_buffers(inst);

		/*If flush is called after queueing buffers but before
		* streamon driver should flush the pending queue*/
		list_for_each_safe(ptr, next, &inst->pendingq) {