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

Commit 2ad43827 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: icp: Read the context acquire info with the lock" into dev/msm-4.9-camx

parents a630ce57 6cd40cdf

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

+4 −4
Original line number Diff line number Diff line
@@ -1398,10 +1398,6 @@ static int cam_icp_mgr_handle_frame_process(uint32_t *msg_ptr, int flag) 
	CAM_DBG(CAM_ICP, "ctx : %pK, request_id :%lld",

		(void *)ctx_data->context_priv, request_id);



	clk_type = ICP_DEV_TYPE_TO_CLK_TYPE(ctx_data->icp_dev_acquire_info->

		dev_type);

	cam_icp_device_timer_reset(&icp_hw_mgr, clk_type);



	mutex_lock(&ctx_data->ctx_mutex);

	cam_icp_ctx_timer_reset(ctx_data);

	if (ctx_data->state != CAM_ICP_CTX_STATE_ACQUIRED) {
@@ -1411,6 +1407,10 @@ static int cam_icp_mgr_handle_frame_process(uint32_t *msg_ptr, int flag) 
		return 0;

	}



	clk_type = ICP_DEV_TYPE_TO_CLK_TYPE(

			ctx_data->icp_dev_acquire_info->dev_type);

	cam_icp_device_timer_reset(&icp_hw_mgr, clk_type);



	hfi_frame_process = &ctx_data->hfi_frame_process;

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

		if (hfi_frame_process->request_id[i] == request_id)