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

Commit 19f93953 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:isp: Sync Raw & Pixel frame IDs in case of offline ISP"

parents 97f1c93f 8791e16b

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

+11 −1
Original line number Diff line number Diff line
@@ -2458,6 +2458,16 @@ static int msm_isp_start_axi_stream(struct vfe_device *vfe_dev, 
			if (SRC_TO_INTF(stream_info->stream_src) >= VFE_RAW_0 &&

				SRC_TO_INTF(stream_info->stream_src) <

				VFE_SRC_MAX) {

				/* Incase PIX and RDI streams are part of same

				 * session, this will ensure RDI stream will

				 * have same frame id as of PIX stream

				 */

				if (stream_cfg_cmd->sync_frame_id_src)

					vfe_dev->axi_data.src_info[SRC_TO_INTF(

					stream_info->stream_src)].frame_id =

					vfe_dev->axi_data.src_info[VFE_PIX_0]

					.frame_id;

				else

					vfe_dev->axi_data.src_info[SRC_TO_INTF(

					stream_info->stream_src)].frame_id = 0;

				vfe_dev->axi_data.src_info[SRC_TO_INTF(

include/media/msmb_isp.h

+1 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ struct msm_vfe_axi_stream_cfg_cmd { 
	uint8_t num_streams;

	uint32_t stream_handle[VFE_AXI_SRC_MAX];

	enum msm_vfe_axi_stream_cmd cmd;

	uint8_t sync_frame_id_src;

};



enum msm_vfe_axi_stream_update_type {