Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94a4b2f1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Fix race condition in STOP command"

parents d3a9be6b 54865848

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

+8 −0
Original line number Diff line number Diff line
@@ -1024,6 +1024,14 @@ static int msm_vidc_start_streaming(struct vb2_queue *q, unsigned int count) 
		goto stream_start_failed;

	}



	rc = msm_vidc_send_pending_eos_buffers(inst);

	if (rc) {

		dprintk(VIDC_ERR,

			"Failed : Send pending EOS buffs for Inst = %pK, %d\n",

				inst, rc);

		goto stream_start_failed;

	}



stream_start_failed:

	if (rc) {

		struct msm_vidc_buffer *temp, *next;

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

+45 −18
Original line number Diff line number Diff line
@@ -3727,6 +3727,42 @@ int msm_comm_try_state(struct msm_vidc_inst *inst, int state) 
	return rc;

}



int msm_vidc_send_pending_eos_buffers(struct msm_vidc_inst *inst)

{

	struct vidc_frame_data data = {0};

	struct hfi_device *hdev;

	struct eos_buf *binfo = NULL, *temp = NULL;

	int rc = 0;



	if (!inst || !inst->core || !inst->core->device) {

		dprintk(VIDC_ERR, "%s: Invalid arguments\n", __func__);

		return -EINVAL;

	}



	mutex_lock(&inst->eosbufs.lock);

	list_for_each_entry_safe(binfo, temp, &inst->eosbufs.list, list) {

		data.alloc_len = binfo->smem.size;

		data.device_addr = binfo->smem.device_addr;

		data.clnt_data = data.device_addr;

		data.buffer_type = HAL_BUFFER_INPUT;

		data.filled_len = 0;

		data.offset = 0;

		data.flags = HAL_BUFFERFLAG_EOS;

		data.timestamp = LLONG_MAX;

		data.extradata_addr = data.device_addr;

		data.extradata_size = 0;

		dprintk(VIDC_DBG, "Queueing EOS buffer %pK\n",

				(void *)(u64)data.device_addr);

		hdev = inst->core->device;



		rc = call_hfi_op(hdev, session_etb, inst->session,

				&data);

	}

	mutex_unlock(&inst->eosbufs.lock);



	return rc;

}



int msm_vidc_comm_cmd(void *instance, union msm_v4l2_cmd *cmd)

{

	struct msm_vidc_inst *inst = instance;
@@ -3799,9 +3835,7 @@ int msm_vidc_comm_cmd(void *instance, union msm_v4l2_cmd *cmd) 
	}

	case V4L2_DEC_CMD_STOP:

	{

		struct vidc_frame_data data = {0};

		struct hfi_device *hdev;

		struct eos_buf *binfo;

		struct eos_buf *binfo = NULL;

		u32 smem_flags = 0;



		get_inst(inst->core, inst);
@@ -3828,6 +3862,7 @@ int msm_vidc_comm_cmd(void *instance, union msm_v4l2_cmd *cmd) 
		if (rc) {

			dprintk(VIDC_ERR,

				"Failed to allocate output memory\n");

			rc = -ENOMEM;

			goto exit;

		}
@@ -3835,22 +3870,14 @@ int msm_vidc_comm_cmd(void *instance, union msm_v4l2_cmd *cmd) 
		list_add_tail(&binfo->list, &inst->eosbufs.list);

		mutex_unlock(&inst->eosbufs.lock);



		data.alloc_len = binfo->smem.size;

		data.device_addr = binfo->smem.device_addr;

		data.clnt_data = data.device_addr;

		data.buffer_type = HAL_BUFFER_INPUT;

		data.filled_len = 0;

		data.offset = 0;

		data.flags = HAL_BUFFERFLAG_EOS;

		data.timestamp = LLONG_MAX;

		data.extradata_addr = data.device_addr;

		data.extradata_size = 0;

		dprintk(VIDC_DBG, "Queueing EOS buffer %pK\n",

			(void *)(u64)data.device_addr);

		hdev = inst->core->device;

		if (inst->state != MSM_VIDC_START_DONE) {

			dprintk(VIDC_DBG,

				"Inst = %pK is not ready for EOS\n", inst);

			goto exit;

		}



		rc = msm_vidc_send_pending_eos_buffers(inst);



		rc = call_hfi_op(hdev, session_etb, inst->session,

				&data);

exit:

		put_inst(inst);

		break;

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

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ int msm_comm_hal_to_v4l2(int id, int value); 
int msm_comm_get_v4l2_profile(int fourcc, int profile);

int msm_comm_get_v4l2_level(int fourcc, int level);

int msm_comm_session_continue(void *instance);

int msm_vidc_send_pending_eos_buffers(struct msm_vidc_inst *inst);

enum hal_uncompressed_format msm_comm_get_hal_uncompressed(int fourcc);

u32 get_frame_size_nv12(int plane, u32 height, u32 width);

u32 get_frame_size_nv12_ubwc(int plane, u32 height, u32 width);