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

Commit 706c26b4 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: initialize pd stats buffer index"

parents c5c36cb0 2f4908dc

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

+0 −2
Original line number Diff line number Diff line
@@ -995,8 +995,6 @@ static void msm_isp_update_pd_stats_idx(struct vfe_device *vfe_dev, 
	uint32_t pingpong_status = 0, pingpong_bit = 0;

	struct msm_isp_buffer *done_buf = NULL;

	int vfe_idx = -1;

	/* initialize pd_buf_idx with an invalid index 0xF */

	vfe_dev->pd_buf_idx = 0xF;



	if (frame_src < VFE_RAW_0 || frame_src >  VFE_RAW_2)

		return;

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

+3 −2
Original line number Diff line number Diff line
@@ -228,9 +228,10 @@ static int32_t msm_isp_stats_buf_divert(struct vfe_device *vfe_dev, 
		done_buf->buf_idx;



	stats_event->pd_stats_idx = 0xF;

	if (stream_info->stats_type == MSM_ISP_STATS_BF)

	if (stream_info->stats_type == MSM_ISP_STATS_BF) {

		stats_event->pd_stats_idx = vfe_dev->pd_buf_idx;



		vfe_dev->pd_buf_idx = 0xF;

	}

	if (comp_stats_type_mask == NULL) {

		stats_event->stats_mask =

			1 << stream_info->stats_type;

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

+3 −0
Original line number Diff line number Diff line
@@ -2315,6 +2315,9 @@ int msm_isp_open_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) 
	vfe_dev->reg_update_requested = 0;

	/* Register page fault handler */

	vfe_dev->buf_mgr->pagefault_debug_disable = 0;

	/* initialize pd_buf_idx with an invalid index 0xF */

	vfe_dev->pd_buf_idx = 0xF;



	cam_smmu_reg_client_page_fault_handler(

			vfe_dev->buf_mgr->iommu_hdl,

			msm_vfe_iommu_fault_handler, vfe_dev);