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

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

Merge "msm: camera: create new ISP_EVENT_BUF_DONE"

parents 29695317 55f1ed52

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

+13 −0
Original line number Diff line number Diff line
@@ -786,6 +786,7 @@ static void msm_isp_process_done_buf(struct vfe_device *vfe_dev, 
	uint32_t stream_idx = HANDLE_TO_IDX(stream_info->stream_handle);

	uint32_t frame_id = vfe_dev->axi_data.

		src_info[SRC_TO_INTF(stream_info->stream_src)].frame_id;

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



	if (buf && ts) {

		if (stream_info->buf_divert) {
@@ -815,6 +816,18 @@ static void msm_isp_process_done_buf(struct vfe_device *vfe_dev, 
					&buf_event);

			}

		} else {

			buf_event.input_intf =

				SRC_TO_INTF(stream_info->stream_src);

			buf_event.frame_id = frame_id;

			buf_event.timestamp = ts->buf_time;

			buf_event.u.buf_done.session_id =

				stream_info->session_id;

			buf_event.u.buf_done.stream_id =

				stream_info->stream_id;

			buf_event.u.buf_done.output_format =

				stream_info->runtime_output_format;

			msm_isp_send_event(vfe_dev,

				ISP_EVENT_BUF_DONE, &buf_event);

			vfe_dev->buf_mgr->ops->buf_done(vfe_dev->buf_mgr,

				buf->bufq_handle, buf->buf_idx,

				&ts->buf_time, frame_id,

include/media/msmb_isp.h

+3 −1
Original line number Diff line number Diff line
@@ -303,7 +303,8 @@ enum msm_isp_event_idx { 
	ISP_CAMIF_ERROR     = 6,

	ISP_SOF             = 7,

	ISP_EOF             = 8,

	ISP_EVENT_MAX       = 9

	ISP_BUF_DONE        = 9,

	ISP_EVENT_MAX       = 10

};



#define ISP_EVENT_OFFSET          8
@@ -319,6 +320,7 @@ enum msm_isp_event_idx { 
#define ISP_EVENT_CAMIF_ERROR     (ISP_EVENT_BASE + ISP_CAMIF_ERROR)

#define ISP_EVENT_SOF             (ISP_EVENT_BASE + ISP_SOF)

#define ISP_EVENT_EOF             (ISP_EVENT_BASE + ISP_EOF)

#define ISP_EVENT_BUF_DONE        (ISP_EVENT_BASE + ISP_BUF_DONE)

#define ISP_EVENT_BUF_DIVERT      (ISP_BUF_EVENT_BASE)

#define ISP_EVENT_STATS_NOTIFY    (ISP_STATS_EVENT_BASE)

#define ISP_EVENT_COMP_STATS_NOTIFY (ISP_EVENT_STATS_NOTIFY + MSM_ISP_STATS_MAX)