Merge "msm: camera: isp: Improve logs" (17003145) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/media/platform/msm/camera/cam_isp/cam_isp_context.c

+9 −5

Original line number	Diff line number	Diff line
		@@ -1136,6 +1136,8 @@ static int __cam_isp_ctx_handle_error(struct cam_isp_context *ctx_isp,
		}

		req_isp = (struct cam_isp_ctx_req *) req_to_dump->req_priv;

		if (error_event_data->enable_req_dump)
		cam_isp_ctx_dump_req(req_isp);

		__cam_isp_ctx_update_state_monitor_array(ctx_isp,
		@@ -1849,7 +1851,7 @@ static int __cam_isp_ctx_apply_req_in_bubble(
		static int __cam_isp_ctx_flush_req(struct cam_context *ctx,
		struct list_head req_list, struct cam_req_mgr_flush_request flush_req)
		{
		int i, rc;
		int i, rc, tmp = 0;
		uint32_t cancel_req_id_found = 0;
		struct cam_ctx_request *req;
		struct cam_ctx_request *req_temp;
		@@ -1902,9 +1904,11 @@ static int __cam_isp_ctx_flush_req(struct cam_context *ctx,
		rc = cam_sync_signal(
		req_isp->fence_map_out[i].sync_id,
		CAM_SYNC_STATE_SIGNALED_ERROR);
		if (rc)
		if (rc) {
		tmp = req_isp->fence_map_out[i].sync_id;
		CAM_ERR_RATE_LIMIT(CAM_ISP,
		"signal fence failed\n");
		"signal fence %d failed", tmp);
		}
		req_isp->fence_map_out[i].sync_id = -1;
		}
		}

+8 −6

Original line number	Diff line number	Diff line
		@@ -5654,7 +5654,7 @@ static int cam_ife_hw_mgr_handle_hw_rup(
		break;
		}

		CAM_DBG(CAM_ISP, "RUP done for VFE source %d",
		CAM_DBG(CAM_ISP, "RUP done for VFE:%d source %d", event_info->hw_idx,
		event_info->res_id);

		return 0;
		@@ -5753,7 +5753,8 @@ static int cam_ife_hw_mgr_handle_hw_epoch(
		break;
		}

		CAM_DBG(CAM_ISP, "Epoch for VFE source %d", event_info->res_id);
		CAM_DBG(CAM_ISP, "Epoch for VFE:%d source %d", event_info->hw_idx,
		event_info->res_id);

		return 0;
		}
		@@ -5815,7 +5816,8 @@ static int cam_ife_hw_mgr_handle_hw_sof(
		break;
		}

		CAM_DBG(CAM_ISP, "SOF for VFE source %d", event_info->res_id);
		CAM_DBG(CAM_ISP, "SOF for VFE:%d source %d", event_info->hw_idx,
		event_info->res_id);

		return 0;
		}
		@@ -5860,7 +5862,7 @@ static int cam_ife_hw_mgr_handle_hw_eof(
		break;
		}

		CAM_DBG(CAM_ISP, "EOF for out_res->res_id: 0x%x",
		CAM_DBG(CAM_ISP, "EOF for VFE:%d source %d", event_info->hw_idx,
		event_info->res_id);

		return 0;
		@@ -5890,8 +5892,8 @@ static int cam_ife_hw_mgr_handle_hw_buf_done(
		CAM_ISP_HW_EVENT_DONE, &buf_done_event_data);
		}

		CAM_DBG(CAM_ISP, "Buf done for out_res->res_id: 0x%x",
		event_info->res_id);
		CAM_DBG(CAM_ISP, "Buf done for VFE:%d out_res->res_id: 0x%x",
		event_info->hw_idx, event_info->res_id);

		return 0;
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,7 @@ struct ctx_base_info {
		* @csid_debug: csid debug information
		* @enable_recovery: enable recovery
		* @enable_diag_sensor_status: enable sensor diagnosis status
		* @enable_req_dump: Enable request dump on HW errors
		*
		*/
		struct cam_ife_hw_mgr_debug {
		@@ -88,6 +89,7 @@ struct cam_ife_hw_mgr_debug {
		uint64_t csid_debug;
		uint32_t enable_recovery;
		uint32_t camif_debug;
		uint32_t enable_req_dump;
		};

		/**

+2 −0

Original line number	Diff line number	Diff line
		@@ -199,11 +199,13 @@ struct cam_isp_hw_eof_event_data {
		* @timestamp: Timestamp for the error event
		* @recovery_enabled: Identifies if the context needs to recover & reapply
		* this request
		* @enable_req_dump: Enable request dump on HW errors
		*/
		struct cam_isp_hw_error_event_data {
		uint32_t error_type;
		uint64_t timestamp;
		bool recovery_enabled;
		bool enable_req_dump;
		};

		/* enum cam_isp_hw_mgr_command - Hardware manager command type */

+0 −1