Merge "msm: camera: isp: Dump hbi & vbi info incase of dual VFE" into dev/msm-4.14-camx (76ef29c4) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+12 −11

Original line number	Diff line number	Diff line
		@@ -3481,17 +3481,25 @@ static int cam_ife_mgr_cmd_get_sof_timestamp(

		list_for_each_entry(hw_mgr_res, &ife_ctx->res_list_ife_csid, list) {
		for (i = 0; i < CAM_ISP_HW_SPLIT_MAX; i++) {
		if (!hw_mgr_res->hw_res[i] \|\|
		(i == CAM_ISP_HW_SPLIT_RIGHT))
		if (!hw_mgr_res->hw_res[i])
		continue;

		/*
		* Get the SOF time stamp from left resource only.
		* Left resource is master for dual vfe case and
		* Rdi only context case left resource only hold
		* the RDI resource
		*/

		hw_intf = hw_mgr_res->hw_res[i]->hw_intf;
		if (hw_intf->hw_ops.process_cmd) {
		/*
		* Single VFE case, Get the time stamp from
		* available one csid hw in the context
		* Dual VFE case, get the time stamp from
		* master(left) would be sufficient
		*/

		csid_get_time.node_res =
		hw_mgr_res->hw_res[i];
		rc = hw_intf->hw_ops.process_cmd(
		@@ -3500,23 +3508,16 @@ static int cam_ife_mgr_cmd_get_sof_timestamp(
		&csid_get_time,
		sizeof(
		struct cam_csid_get_time_stamp_args));
		if (!rc) {
		if (!rc && (i == CAM_ISP_HW_SPLIT_LEFT)) {
		*time_stamp =
		csid_get_time.time_stamp_val;
		*boot_time_stamp =
		csid_get_time.boot_timestamp;
		}
		/*
		* Single VFE case, Get the time stamp from available
		* one csid hw in the context
		* Dual VFE case, get the time stamp from master(left)
		* would be sufficient
		*/
		goto end;
		}
		}
		}
		end:

		if (rc)
		CAM_ERR(CAM_ISP, "Getting sof time stamp failed");

+4 −4

Original line number	Diff line number	Diff line
		@@ -2177,10 +2177,10 @@ static int cam_ife_csid_get_hbi_vbi(
		rdi_reg->csid_rdi_format_measure2_addr);
		}

		CAM_INFO_RATE_LIMIT(CAM_ISP, "Resource %u HBI: 0x%x", res->res_id,
		hbi);
		CAM_INFO_RATE_LIMIT(CAM_ISP, "Resource %u VBI: 0x%x", res->res_id,
		vbi);
		CAM_INFO_RATE_LIMIT(CAM_ISP,
		"Device %s index %u Resource %u HBI: 0x%x VBI: 0x%x",
		soc_info->dev_name, soc_info->index,
		res->res_id, hbi, vbi);

		return 0;
		}