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

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

Merge "msm: isp: buffer queue management specific flags"

parents 30f2efab 6739177a

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

+1 −1
Original line number Diff line number Diff line
@@ -951,7 +951,7 @@ void msm_isp_notify(struct vfe_device *vfe_dev, uint32_t event_type, 
			spin_unlock_irqrestore(&vfe_dev->common_data->

				common_dev_data_lock, flags);

		} else {

			if (frame_src == VFE_PIX_0) {

			if (frame_src <= VFE_RAW_2) {

				msm_isp_check_for_output_error(vfe_dev, ts,

					&event_data.u.sof_info);

			}

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

+0 −3
Original line number Diff line number Diff line
@@ -370,9 +370,6 @@ void msm_isp_fetch_engine_done_notify(struct vfe_device *vfe_dev, 
	struct msm_vfe_fetch_engine_info *fetch_engine_info)

{

	struct msm_isp_event_data fe_rd_done_event;

	if (!fetch_engine_info->is_busy)

		return;



	memset(&fe_rd_done_event, 0, sizeof(struct msm_isp_event_data));

	fe_rd_done_event.frame_id =

		vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id;

include/uapi/media/msmb_isp.h

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 
#define ISP_META_CHANNEL_BIT  (0x10000 << 3)

#define ISP_SCRATCH_BUF_BIT   (0x10000 << 4)

#define ISP_OFFLINE_STATS_BIT (0x10000 << 5)

#define ISP_SVHDR_IN_BIT      (0x10000 << 6) /* RDI hw stream for SVHDR */

#define ISP_SVHDR_OUT_BIT     (0x10000 << 7) /* SVHDR output bufq stream*/



#define ISP_STATS_STREAM_BIT  0x80000000



struct msm_vfe_cfg_cmd_list;