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

Commit c6322f5b authored by Lynus Vaz's avatar Lynus Vaz Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: icp: Reset timers if context is busy 



If the ICP context has pending submissions, don't power off the clock
and remove the bandwidth votes just yet. Instead, reset the idle
timers so we can try again later.

Change-Id: I0d77411b70c854c15efd32742ba936135a1b780f
Signed-off-by: default avatarLynus Vaz <lvaz@codeaurora.org>
parent 488bd904

drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+61 −28
Original line number Diff line number Diff line
@@ -245,6 +245,38 @@ static int cam_icp_ctx_clk_info_init(struct cam_icp_hw_ctx_data *ctx_data) 
	return 0;

}



static bool cam_icp_frame_pending(struct cam_icp_hw_ctx_data *ctx_data)

{

	return !bitmap_empty(ctx_data->hfi_frame_process.bitmap,

			CAM_FRAME_CMD_MAX);

}



static int cam_icp_ctx_timer_reset(struct cam_icp_hw_ctx_data *ctx_data)

{

	if (ctx_data && ctx_data->watch_dog) {

		ctx_data->watch_dog_reset_counter++;

		CAM_DBG(CAM_ICP, "reset timer : ctx_id = %d, counter=%d",

			ctx_data->ctx_id, ctx_data->watch_dog_reset_counter);

		crm_timer_reset(ctx_data->watch_dog);

	}



	return 0;

}



static void cam_icp_device_timer_reset(struct cam_icp_hw_mgr *hw_mgr,

	int device_index)

{

	if ((device_index >= ICP_CLK_HW_MAX) || (!hw_mgr))

		return;



	if (hw_mgr->clk_info[device_index].watch_dog) {

		CAM_DBG(CAM_ICP, "reset timer : device_index = %d",

			device_index);

		crm_timer_reset(hw_mgr->clk_info[device_index].watch_dog);

		hw_mgr->clk_info[device_index].watch_dog_reset_counter++;

	}

}



static int32_t cam_icp_deinit_idle_clk(void *priv, void *data)

{

	struct cam_icp_hw_mgr *hw_mgr = (struct cam_icp_hw_mgr *)priv;
@@ -259,6 +291,8 @@ static int32_t cam_icp_deinit_idle_clk(void *priv, void *data) 
	struct cam_hw_intf *bps_dev_intf = NULL;

	struct cam_hw_intf *dev_intf = NULL;

	struct cam_a5_clk_update_cmd clk_upd_cmd;

	int rc = 0;

	bool busy = false;



	ipe0_dev_intf = hw_mgr->ipe0_dev_intf;

	ipe1_dev_intf = hw_mgr->ipe1_dev_intf;
@@ -268,19 +302,34 @@ static int32_t cam_icp_deinit_idle_clk(void *priv, void *data) 
	clk_info->curr_clk = 0;

	clk_info->over_clked = 0;



	mutex_lock(&hw_mgr->hw_mgr_mutex);



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

		ctx_data = &hw_mgr->ctx_data[i];

		mutex_lock(&ctx_data->ctx_mutex);

		if ((ctx_data->state == CAM_ICP_CTX_STATE_ACQUIRED) &&

			(ICP_DEV_TYPE_TO_CLK_TYPE(ctx_data->

			icp_dev_acquire_info->dev_type) == clk_info->hw_type))

			icp_dev_acquire_info->dev_type) == clk_info->hw_type)) {

			busy = cam_icp_frame_pending(ctx_data);

			if (busy) {

				mutex_unlock(&ctx_data->ctx_mutex);

				break;

			}

			cam_icp_ctx_clk_info_init(ctx_data);

		}

		mutex_unlock(&ctx_data->ctx_mutex);

	}



	if (busy) {

		cam_icp_device_timer_reset(hw_mgr, clk_info->hw_type);

		rc = -EBUSY;

		goto done;

	}



	if ((!ipe0_dev_intf) || (!bps_dev_intf)) {

		CAM_ERR(CAM_ICP, "dev intfs are wrong, failed to update clk");

		return -EINVAL;

		rc = -EINVAL;

		goto done;

	}



	if (clk_info->hw_type == ICP_CLK_HW_BPS) {
@@ -291,7 +340,7 @@ static int32_t cam_icp_deinit_idle_clk(void *priv, void *data) 
		id = CAM_ICP_IPE_CMD_DISABLE_CLK;

	} else {

		CAM_ERR(CAM_ICP, "Error");

		return 0;

		goto done;

	}



	CAM_DBG(CAM_ICP, "Disable %d", clk_info->hw_type);
@@ -308,7 +357,9 @@ static int32_t cam_icp_deinit_idle_clk(void *priv, void *data) 
				&clk_upd_cmd,

				sizeof(struct cam_a5_clk_update_cmd));



	return 0;

done:

	mutex_unlock(&hw_mgr->hw_mgr_mutex);

	return rc;

}



static int32_t cam_icp_ctx_timer(void *priv, void *data)
@@ -339,6 +390,12 @@ static int32_t cam_icp_ctx_timer(void *priv, void *data) 
		return 0;

	}



	if (cam_icp_frame_pending(ctx_data)) {

		cam_icp_ctx_timer_reset(ctx_data);

		mutex_unlock(&ctx_data->ctx_mutex);

		return -EBUSY;

	}



	CAM_DBG(CAM_ICP,

		"E :ctx_id = %d ubw = %lld cbw = %lld curr_fc = %u bc = %u",

		ctx_data->ctx_id,
@@ -533,30 +590,6 @@ static void cam_icp_device_timer_stop(struct cam_icp_hw_mgr *hw_mgr) 
	}

}



static int cam_icp_ctx_timer_reset(struct cam_icp_hw_ctx_data *ctx_data)

{

	if (ctx_data && ctx_data->watch_dog) {

		ctx_data->watch_dog_reset_counter++;

		CAM_DBG(CAM_ICP, "reset timer : ctx_id = %d, counter=%d",

			ctx_data->ctx_id, ctx_data->watch_dog_reset_counter);

		crm_timer_reset(ctx_data->watch_dog);

	}



	return 0;

}



static void cam_icp_device_timer_reset(struct cam_icp_hw_mgr *hw_mgr,

	int device_index)

{

	if ((device_index >= ICP_CLK_HW_MAX) || (!hw_mgr))

		return;



	if (hw_mgr->clk_info[device_index].watch_dog) {

		crm_timer_reset(hw_mgr->clk_info[device_index].watch_dog);

		hw_mgr->clk_info[device_index].watch_dog_reset_counter++;

	}

}



static uint32_t cam_icp_mgr_calc_base_clk(uint32_t frame_cycles,

	uint64_t budget)

{