Merge "msm: camera: isp: Fix for Init Config Handling on Offline IFE Hardware" into camera-kernel.qclinux.1.0

Author: Camera Software Integration

camera/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

@@ -8109,7 +8109,7 @@ int cam_ife_mgr_config_hw(
 					c_ctx->curr_num_exp = hw_update_data->num_exp;
 				}
 				hw_update_data->mup_en = false;
-
+				c_ctx->flags.init_cfg_done = true;
 				/* Try for INIT packet reg dump by default - no debugfs set */
 				if (cfg->init_packet && !g_ife_hw_mgr.debug_cfg.per_req_reg_dump)
 					cam_ife_mgr_handle_reg_dump(hw_mgr_ctx,
@@ -8490,6 +8490,7 @@ static int cam_ife_mgr_stop_hw(void *hw_mgr_priv, void *stop_hw_args)
 end:
 	c_ctx->flags.dump_on_error = false;
 	c_ctx->flags.dump_on_flush = false;
+	c_ctx->flags.init_cfg_done = false;
 	return rc;
 }
 

camera/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.h

@@ -208,6 +208,7 @@ struct cam_ife_hw_mgr_ctx_scratch_buf_info {
  * @rdi_pd_context:      Flag to specify the context has
  *                       only rdi and PD resource without PIX port.
  * @per_port_en:         Indicates if per port feature is enabled or not
+ * @init_cfg_done:       indicate whether init configuration for hw is done or not.
 
  */
 struct cam_ife_hw_mgr_ctx_flags {
@@ -231,6 +232,7 @@ struct cam_ife_hw_mgr_ctx_flags {
 	bool   sys_cache_usage[CAM_LLCC_MAX];
 	bool   rdi_pd_context;
 	bool   per_port_en;
+	bool   init_cfg_done;
 };
 
 /**

camera/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr_addons.c

@@ -183,8 +183,15 @@ int cam_ife_mgr_check_start_processing(void *hw_mgr_priv,
 		list_for_each_entry_safe(c_elem, c_elem_temp,
 				&ife_hw_mgr->input_queue.list, list) {
 			is_init_pkt =
-				((c_elem->prepare.packet->header.op_code + 1) &
-					0xF) == CAM_ISP_PACKET_INIT_DEV;
+				(((c_elem->prepare.packet->header.op_code + 1) & 0xF) ==
+					CAM_ISP_PACKET_INIT_DEV);
+			if ((c_ctx->flags.init_cfg_done && is_init_pkt) ||
+				(!(c_ctx->flags.init_cfg_done) && !(is_init_pkt))) {
+				CAM_DBG(CAM_ISP, "#REJECT#: %s ctx id %d hw_id %d",
+				c_ctx->flags.init_cfg_done ? "Init already done" : "Init not done",
+				c_ctx->ctx_index, c_ctx->acquired_hw_id);
+				continue;
+			}
 			if (c_ctx->waiting_start &&
 				c_elem->ctx_idx != c_ctx->start_ctx_idx) {
 				CAM_DBG(CAM_ISP,