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

Commit 1d1e6967 authored by YUE CHEN's avatar YUE CHEN Committed by Gerrit - the friendly Code Review server
Browse files

msm: ais: handle timestamp for each RDI of IFE 



There are some resource conflicts when handle timestamps of
multi RDIs on the same IFE. need allocate variable to save
timestamp for each RDI path.

Change-Id: Ibd765fe0e9803ea49ca0209c4775851c464d1afa
Signed-off-by: default avatarYUE CHEN <yueche@codeaurora.org>
parent c5ac9792

drivers/media/platform/msm/ais/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c

+25 −14
Original line number Diff line number Diff line 
/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -477,10 +477,12 @@ static int cam_ife_csid_global_reset(struct cam_ife_csid_hw *csid_hw) 
		CAM_ERR(CAM_ISP, "CSID:%d IRQ value after reset rc = %d",

			csid_hw->hw_intf->hw_idx, val);

	csid_hw->error_irq_count = 0;

	csid_hw->prev_boot_timestamp = 0;



	for (i = 0 ; i < CAM_IFE_PIX_PATH_RES_MAX; i++)



	for (i = 0 ; i < CAM_IFE_PIX_PATH_RES_MAX; i++) {

		csid_hw->res_sof_cnt[i] = 0;

		csid_hw->prev_boot_timestamp[i] = 0;

	}



	return rc;

}
@@ -1167,18 +1169,21 @@ static int cam_ife_csid_disable_hw(struct cam_ife_csid_hw *csid_hw) 
	spin_lock_irqsave(&csid_hw->lock_state, flags);

	csid_hw->device_enabled = 0;

	spin_unlock_irqrestore(&csid_hw->lock_state, flags);

	for (i = 0; i < CAM_IFE_PIX_PATH_RES_MAX; i++)

	for (i = 0; i < CAM_IFE_PIX_PATH_RES_MAX; i++) {

		csid_hw->res_sof_cnt[i] = 0;

		csid_hw->prev_boot_timestamp[i] = 0;

	}



	csid_hw->ipp_path_config.measure_enabled = 0;

	csid_hw->ppp_path_config.measure_enabled = 0;

	for (i = 0; i <= CAM_IFE_PIX_PATH_RES_RDI_3; i++)

		csid_hw->rdi_path_config[i].measure_enabled = 0;





	csid_hw->hw_info->hw_state = CAM_HW_STATE_POWER_DOWN;

	csid_hw->error_irq_count = 0;

	csid_hw->fatal_err_detected = false;

	csid_hw->prev_boot_timestamp = 0;





	return rc;

}
@@ -2530,6 +2535,8 @@ static int cam_ife_csid_get_time_stamp( 
		return -EINVAL;

	}



	id = res->res_id;



	if (res->res_id == CAM_IFE_PIX_PATH_RES_IPP) {

		time_32 = cam_io_r_mb(soc_info->reg_map[0].mem_base +

			csid_reg->ipp_reg->csid_pxl_timestamp_curr1_sof_addr);
@@ -2545,7 +2552,6 @@ static int cam_ife_csid_get_time_stamp( 
		time_32 = cam_io_r_mb(soc_info->reg_map[0].mem_base +

			csid_reg->ppp_reg->csid_pxl_timestamp_curr0_sof_addr);

	} else {

		id = res->res_id;

		rdi_reg = csid_reg->rdi_reg[id];

		time_32 = cam_io_r_mb(soc_info->reg_map[0].mem_base +

			rdi_reg->csid_rdi_timestamp_curr1_sof_addr);
@@ -2562,30 +2568,31 @@ static int cam_ife_csid_get_time_stamp( 
		CAM_IFE_CSID_QTIMER_MUL_FACTOR,

		CAM_IFE_CSID_QTIMER_DIV_FACTOR);



	if (!csid_hw->prev_boot_timestamp) {



	if (!csid_hw->prev_boot_timestamp[id]) {

		get_monotonic_boottime64(&ts);

		time_stamp->boot_timestamp =

			(uint64_t)((ts.tv_sec * 1000000000) +

			ts.tv_nsec);

		csid_hw->prev_qtimer_ts = 0;

		csid_hw->prev_qtimer_ts[id] = 0;

		CAM_DBG(CAM_ISP, "timestamp:%lld",

			time_stamp->boot_timestamp);

	} else {

		time_delta = time_stamp->time_stamp_val -

			csid_hw->prev_qtimer_ts;

			csid_hw->prev_qtimer_ts[id];



		if (csid_hw->prev_boot_timestamp >

		if (csid_hw->prev_boot_timestamp[id] >

			U64_MAX - time_delta) {

			CAM_WARN(CAM_ISP, "boottimestamp reached maximum");

			return -EINVAL;

		}



		time_stamp->boot_timestamp =

			csid_hw->prev_boot_timestamp + time_delta;

			csid_hw->prev_boot_timestamp[id] + time_delta;

	}



	csid_hw->prev_qtimer_ts = time_stamp->time_stamp_val;

	csid_hw->prev_boot_timestamp = time_stamp->boot_timestamp;

	csid_hw->prev_qtimer_ts[id] = time_stamp->time_stamp_val;

	csid_hw->prev_boot_timestamp[id] = time_stamp->boot_timestamp;





	return 0;
@@ -4206,12 +4213,16 @@ int cam_ife_csid_hw_probe_init(struct cam_hw_intf *csid_hw_intf, 


	ife_csid_hw->csid_debug = 0;

	ife_csid_hw->error_irq_count = 0;

	ife_csid_hw->prev_boot_timestamp = 0;



	ife_csid_hw->ipp_path_config.measure_enabled = 0;

	ife_csid_hw->ppp_path_config.measure_enabled = 0;

	for (i = 0; i <= CAM_IFE_PIX_PATH_RES_RDI_3; i++)

		ife_csid_hw->rdi_path_config[i].measure_enabled = 0;





	for (i = 0; i <= CAM_IFE_PIX_PATH_RES_MAX; i++)

		ife_csid_hw->prev_boot_timestamp[i] = 0;



	scnprintf(worker_name, sizeof(worker_name),

		"csid%u_worker", ife_csid_hw->hw_intf->hw_idx);

	CAM_DBG(CAM_ISP, "Create CSID worker %s", worker_name);

drivers/media/platform/msm/ais/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.h

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -564,8 +564,8 @@ struct cam_ife_csid_hw { 
	uint32_t                         dual_usage;

	uint32_t                         init_frame_drop;

	uint32_t                         res_sof_cnt[CAM_IFE_PIX_PATH_RES_MAX];

	uint64_t                         prev_boot_timestamp;

	uint64_t                         prev_qtimer_ts;

	uint64_t             prev_boot_timestamp[CAM_IFE_PIX_PATH_RES_MAX];

	uint64_t             prev_qtimer_ts[CAM_IFE_PIX_PATH_RES_MAX];

	struct cam_hw_intf              *ppi_hw_intf[CAM_CSID_PPI_HW_MAX];

	bool                             ppi_enable;

	bool                             fatal_err_detected;