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

Commit 8eca27b7 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera_v2: Fix page fault issue in camera ISP"

parents 036dda2e 62bcdd9d

drivers/media/platform/msm/camera_v2/isp/msm_isp.h

+9 −0
Original line number Diff line number Diff line
@@ -424,6 +424,12 @@ enum msm_isp_comp_irq_types { 


#define MSM_VFE_REQUESTQ_SIZE 8



struct msm_isp_pending_buf_info {

	uint32_t is_buf_done_pending;

	struct msm_isp_buffer *buf;

	uint32_t frame_id;

};



struct msm_vfe_axi_stream {

	uint32_t frame_id;

	enum msm_vfe_axi_state state;
@@ -480,6 +486,7 @@ struct msm_vfe_axi_stream { 
	uint32_t vfe_mask;

	uint32_t composite_irq[MSM_ISP_COMP_IRQ_MAX];

	int lpm_mode;

	struct msm_isp_pending_buf_info pending_buf_info;

};



struct msm_vfe_axi_composite_info {
@@ -755,6 +762,7 @@ struct msm_vfe_common_dev_data { 
	/* Irq debug Info */

	struct msm_vfe_irq_dump vfe_irq_dump;

	struct msm_vfe_tasklet tasklets[MAX_VFE + 1];

	uint32_t drop_reconfig;

};



struct msm_vfe_common_subdev {
@@ -864,6 +872,7 @@ struct vfe_device { 
	struct resource *dual_vfe_irq;

	/* irq info */

	uint32_t dual_irq_mask;

	uint32_t irq_sof_id;

};



struct vfe_parent_device {

drivers/media/platform/msm/camera_v2/isp/msm_isp47.c

+3 −1
Original line number Diff line number Diff line
@@ -709,8 +709,10 @@ void msm_isp47_preprocess_camif_irq(struct vfe_device *vfe_dev, 
{

	if (irq_status0 & BIT(3))

		vfe_dev->axi_data.src_info[VFE_PIX_0].accept_frame = false;

	if (irq_status0 & BIT(0))

	if (irq_status0 & BIT(0)) {

		vfe_dev->axi_data.src_info[VFE_PIX_0].accept_frame = true;

		vfe_dev->irq_sof_id++;

	}

}



void msm_vfe47_reg_update(struct vfe_device *vfe_dev,

drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c

+105 −10
Original line number Diff line number Diff line
@@ -30,6 +30,13 @@ static void __msm_isp_axi_stream_update( 
			struct msm_vfe_axi_stream *stream_info,

			struct msm_isp_timestamp *ts);



static int msm_isp_process_done_buf(struct vfe_device *vfe_dev,

	struct msm_vfe_axi_stream *stream_info, struct msm_isp_buffer *buf,

	struct timeval *time_stamp, uint32_t frame_id);

static void msm_isp_free_pending_buffer(

	struct vfe_device *vfe_dev,

	struct msm_vfe_axi_stream *stream_info,

	struct msm_isp_timestamp *ts);

static int msm_isp_update_stream_bandwidth(

		struct msm_vfe_axi_stream *stream_info, int enable);
@@ -670,12 +677,18 @@ void msm_isp_process_reg_upd_epoch_irq(struct vfe_device *vfe_dev, 
		case MSM_ISP_COMP_IRQ_REG_UPD:

			stream_info->activated_framedrop_period =

				stream_info->requested_framedrop_period;

			/* Free Pending Buffers which are backed-up due to

			 * delay in RUP from userspace to Avoid pageFault

			 */

			msm_isp_free_pending_buffer(vfe_dev, stream_info, ts);

			__msm_isp_axi_stream_update(stream_info, ts);

			break;

		case MSM_ISP_COMP_IRQ_EPOCH:

			if (stream_info->state == ACTIVE)

			if (stream_info->state == ACTIVE) {

				msm_isp_update_framedrop_reg(stream_info,

					vfe_dev->isp_page->drop_reconfig);

					vfe_dev->common_data->drop_reconfig);

				vfe_dev->common_data->drop_reconfig = 0;

			}

			break;

		default:

			WARN(1, "Invalid irq %d\n", irq);
@@ -1570,6 +1583,40 @@ static void msm_isp_axi_stream_enable_cfg( 
	}

}



static void msm_isp_free_pending_buffer(

			struct vfe_device *vfe_dev,

			struct msm_vfe_axi_stream *stream_info,

			struct msm_isp_timestamp *ts)

{

	struct timeval *time_stamp;

	struct msm_isp_buffer *done_buf = NULL;

	uint32_t frame_id;

	int rc;



	if (!stream_info->controllable_output ||

		!stream_info->pending_buf_info.is_buf_done_pending)	{

		return;

	}



	if (vfe_dev->vt_enable) {

		msm_isp_get_avtimer_ts(ts);

		time_stamp = &ts->vt_time;

	} else {

		time_stamp = &ts->buf_time;

	}



	done_buf = stream_info->pending_buf_info.buf;

	frame_id = stream_info->pending_buf_info.frame_id;

	if (done_buf) {

		rc = msm_isp_process_done_buf(vfe_dev, stream_info,

			done_buf, time_stamp, frame_id);

		if (rc == 0) {

			stream_info->pending_buf_info.buf = NULL;

			stream_info->pending_buf_info.is_buf_done_pending = 0;

		}

	}

}



static void __msm_isp_axi_stream_update(

			struct msm_vfe_axi_stream *stream_info,

			struct msm_isp_timestamp *ts)
@@ -2092,7 +2139,6 @@ static int msm_isp_process_done_buf(struct vfe_device *vfe_dev, 
	uint32_t buf_src;

	uint8_t drop_frame = 0;

	struct msm_isp_bufq *bufq = NULL;



	memset(&buf_event, 0, sizeof(buf_event));



	if (stream_idx >= VFE_AXI_SRC_MAX) {
@@ -2775,6 +2821,7 @@ int msm_isp_axi_reset(struct vfe_device *vfe_dev, 
			axi_data->src_info[SRC_TO_INTF(

				stream_info->stream_src)].frame_id =

				reset_cmd->frame_id;

			temp_vfe_dev->irq_sof_id = reset_cmd->frame_id;

		}

		msm_isp_reset_burst_count_and_frame_drop(

			vfe_dev, stream_info);
@@ -3046,6 +3093,13 @@ static void __msm_isp_stop_axi_streams(struct vfe_device *vfe_dev, 
		msm_isp_cfg_stream_scratch(stream_info, VFE_PING_FLAG);

		msm_isp_cfg_stream_scratch(stream_info, VFE_PONG_FLAG);

		stream_info->undelivered_request_cnt = 0;

		vfe_dev->irq_sof_id = 0;

		if (stream_info->controllable_output &&

			stream_info->pending_buf_info.is_buf_done_pending) {

			msm_isp_free_pending_buffer(vfe_dev, stream_info,

				&timestamp);

			stream_info->pending_buf_info.is_buf_done_pending = 0;

		}

		for (k = 0; k < stream_info->num_isp; k++) {

			vfe_dev = stream_info->vfe_dev[k];

			if (stream_info->num_planes > 1)
@@ -3209,7 +3263,6 @@ static int msm_isp_start_axi_stream(struct vfe_device *vfe_dev_ioctl, 
			mutex_unlock(&vfe_dev_ioctl->buf_mgr->lock);

			goto error;

		}



		msm_isp_calculate_bandwidth(stream_info);

		for (k = 0; k < stream_info->num_isp; k++) {

			msm_isp_get_stream_wm_mask(stream_info->vfe_dev[k],
@@ -3555,16 +3608,25 @@ static int msm_isp_request_frame(struct vfe_device *vfe_dev, 
	 */

	if (vfe_dev->axi_data.src_info[frame_src].active &&

		frame_src == VFE_PIX_0 &&

		vfe_dev->axi_data.src_info[frame_src].accept_frame == false) {

		vfe_dev->axi_data.src_info[frame_src].accept_frame == false &&

		(stream_info->undelivered_request_cnt <=

			MAX_BUFFERS_IN_HW)

		) {

		pr_debug("%s:%d invalid time to request frame %d\n",

			__func__, __LINE__, frame_id);

		vfe_dev->isp_page->drop_reconfig = 1;

		/*keep it in vfe_dev variable also to avoid skip pattern

		 * programming the variable in page can be overwritten by MCT

		 */

		vfe_dev->common_data->drop_reconfig = 1;

	} else if ((vfe_dev->axi_data.src_info[frame_src].active) &&

			(frame_id ==

			vfe_dev->axi_data.src_info[frame_src].frame_id) &&

			((frame_id ==

			vfe_dev->axi_data.src_info[frame_src].frame_id) ||

			(frame_id == vfe_dev->irq_sof_id)) &&

			(stream_info->undelivered_request_cnt <=

				MAX_BUFFERS_IN_HW)) {

		vfe_dev->isp_page->drop_reconfig = 1;

		vfe_dev->common_data->drop_reconfig = 1;

		pr_debug("%s: vfe_%d request_frame %d cur frame id %d pix %d\n",

			__func__, vfe_dev->pdev->id, frame_id,

			vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id,
@@ -4304,9 +4366,25 @@ void msm_isp_process_axi_irq_stream(struct vfe_device *vfe_dev, 
			ISP_DBG("%s: Error configuring ping_pong\n",

				__func__);

	} else if (done_buf && (done_buf->is_drop_reconfig != 1)) {

		int32_t frame_id_diff;

		/* irq_sof should be always >= tasklet SOF id

		 * For dual camera usecase irq_sof could be behind

		 * as software frameid sync logic epoch event could

		 * update slave frame id so update if irqsof < tasklet sof

		 */

		if (vfe_dev->irq_sof_id < frame_id)

			vfe_dev->irq_sof_id = frame_id;



		frame_id_diff  =  vfe_dev->irq_sof_id - frame_id;

		if (stream_info->controllable_output && frame_id_diff > 1) {

			/*scheduling problem need to do recovery*/

			spin_unlock_irqrestore(&stream_info->lock, flags);

			msm_isp_halt_send_error(vfe_dev,

				ISP_EVENT_PING_PONG_MISMATCH);

			return;

		}

		msm_isp_cfg_stream_scratch(stream_info, pingpong_status);

	}



	if (!done_buf) {

		if (stream_info->buf_divert) {

			vfe_dev->error_info.stream_framedrop_count[
@@ -4355,13 +4433,30 @@ void msm_isp_process_axi_irq_stream(struct vfe_device *vfe_dev, 
	 * then dont issue buf-done for current buffer

	 */

		done_buf->is_drop_reconfig = 0;

		if (!stream_info->buf[pingpong_bit]) {

			/*samebuffer is not re-programeed so program scratch*/

			msm_isp_cfg_stream_scratch(stream_info,

				pingpong_status);

		}

		spin_unlock_irqrestore(&stream_info->lock, flags);

	} else {

		/* If there is no regupdate from userspace then dont

		 * free buffer immediately, delegate it to RegUpdateAck

		 */

		if (stream_info->controllable_output &&

			!(vfe_dev->reg_update_requested &

				BIT((uint32_t)VFE_PIX_0))) {

			stream_info->pending_buf_info.is_buf_done_pending = 1;

			stream_info->pending_buf_info.buf = done_buf;

			stream_info->pending_buf_info.frame_id = frame_id;

		}

		spin_unlock_irqrestore(&stream_info->lock, flags);

		if (stream_info->pending_buf_info.is_buf_done_pending != 1) {

			msm_isp_process_done_buf(vfe_dev, stream_info,

				done_buf, time_stamp, frame_id);

		}

	}

}



void msm_isp_process_axi_irq(struct vfe_device *vfe_dev,

	uint32_t irq_status0, uint32_t irq_status1, uint32_t dual_irq_status,

drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c

+2 −1
Original line number Diff line number Diff line
@@ -2351,7 +2351,8 @@ int msm_isp_open_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) 
	vfe_dev->isp_raw0_debug = 0;

	vfe_dev->isp_raw1_debug = 0;

	vfe_dev->isp_raw2_debug = 0;



	vfe_dev->irq_sof_id = 0;

	vfe_dev->common_data->drop_reconfig = 0;

	if (vfe_dev->hw_info->vfe_ops.core_ops.init_hw(vfe_dev) < 0) {

		pr_err("%s: init hardware failed\n", __func__);

		vfe_dev->vfe_open_cnt--;