msm: camera: common: Fix TFE and OPE compilation errors

Fix syntactical errors that resulted in failed compilation
for TFE and OPE.

CRs-Fixed: 3179075
Change-Id: Iec4dc104160651fb46b18be17a556356dce3b3c0
Signed-off-by: Sokchetra Eung <[email protected]>

drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c

@@ -375,7 +375,7 @@ static void cam_tfe_hw_mgr_stop_hw_res(
 				CAM_ISP_HW_CMD_STOP_BUS_ERR_IRQ,
 				&dummy_args, sizeof(dummy_args));
 		}
-		isp_hw_res->hw_res[i]->rdi_only_ctx = false;
+		isp_hw_res->hw_res[i]->is_rdi_primary_res = false;
 	}
 }
 
@@ -605,7 +605,7 @@ static int cam_tfe_mgr_csid_stop_hw(
 		hw_intf->hw_ops.stop(hw_intf->hw_priv, &stop, sizeof(stop));
 
 		for (i = 0; i < cnt; i++)
-			stop_res[i]->rdi_only_ctx = false;
+			stop_res[i]->is_rdi_primary_res = false;
 	}
 
 	return 0;
@@ -3286,7 +3286,7 @@ start_only:
 		case CAM_ISP_TFE_OUT_RES_RDI_1:
 		case CAM_ISP_TFE_OUT_RES_RDI_2:
 			if (!res_rdi_context_set && ctx->is_rdi_only_context) {
-				hw_mgr_res->hw_res[0]->rdi_only_ctx =
+				hw_mgr_res->hw_res[0]->is_rdi_primary_res =
 					ctx->is_rdi_only_context;
 				res_rdi_context_set = true;
 				primary_rdi_out_res = hw_mgr_res->res_id;
@@ -3316,7 +3316,7 @@ start_only:
 		 * subscription should be sufficient
 		 */
 		if (primary_rdi_in_res == hw_mgr_res->res_id)
-			hw_mgr_res->hw_res[0]->rdi_only_ctx =
+			hw_mgr_res->hw_res[0]->is_rdi_primary_res =
 				ctx->is_rdi_only_context;
 
 		rc = cam_tfe_hw_mgr_start_hw_res(hw_mgr_res, ctx);
@@ -5261,7 +5261,6 @@ static int cam_tfe_hw_mgr_handle_csid_event(
 			break;
 
 		error_event_data.error_type = err_type;
-		error_event_data.error_code = CAM_REQ_MGR_CSID_FATAL_ERROR;
 		cam_tfe_hw_mgr_find_affected_ctx(&error_event_data,
 			event_info->hw_idx,
 			&recovery_data);
@@ -5311,8 +5310,6 @@ static int cam_tfe_hw_mgr_handle_hw_err(
 	else
 		error_event_data.recovery_enabled = false;
 
-	error_event_data.error_code = CAM_REQ_MGR_ISP_UNREPORTED_ERROR;
-
 	rc = cam_tfe_hw_mgr_find_affected_ctx(&error_event_data,
 		core_idx, &recovery_data);
 	if (rc || !(recovery_data.no_of_context))

drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_bus.c

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/ratelimit.h>
@@ -1397,7 +1398,7 @@ static int cam_tfe_bus_acquire_tfe_out(void *priv, void *acquire_args,
 
 	bus_priv->tasklet_info = acq_args->tasklet;
 	rsrc_data->num_wm = num_wm;
-	rsrc_node->rdi_only_ctx = 0;
+	rsrc_node->is_rdi_primary_res = 0;
 	rsrc_node->res_id = out_acquire_args->out_port_info->res_id;
 	rsrc_node->cdm_ops = out_acquire_args->cdm_ops;
 	rsrc_data->cdm_util_ops = out_acquire_args->cdm_ops;
@@ -1563,7 +1564,7 @@ static int cam_tfe_bus_start_tfe_out(void *hw_priv,
 	rc = cam_tfe_bus_start_comp_grp(rsrc_data->comp_grp);
 
 	if (rsrc_data->is_dual && !rsrc_data->is_master &&
-		!tfe_out->rdi_only_ctx)
+		!tfe_out->is_rdi_primary_res)
 		goto end;
 
 	if (common_data->rup_irq_enable[rup_group_id])

drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.c

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/delay.h>
@@ -712,7 +713,7 @@ static int cam_tfe_irq_bottom_half(void *handler_priv,
 			CAM_ISP_HW_TFE_IN_RDI2) &&
 			(top_priv->in_rsrc[i].res_state ==
 			CAM_ISP_RESOURCE_STATE_STREAMING) &&
-			top_priv->in_rsrc[i].rdi_only_ctx) {
+			top_priv->in_rsrc[i].is_rdi_primary_res) {
 			rdi_priv = (struct cam_tfe_rdi_data *)
 				top_priv->in_rsrc[i].res_priv;
 			event_cb = rdi_priv->event_cb;
@@ -1962,7 +1963,7 @@ int cam_tfe_top_release(void *device_priv,
 	in_res->res_state = CAM_ISP_RESOURCE_STATE_AVAILABLE;
 	in_res->cdm_ops = NULL;
 	in_res->tasklet_info = NULL;
-	in_res->rdi_only_ctx = 0;
+	in_res->is_rdi_primary_res = 0;
 
 	return 0;
 }
@@ -2194,7 +2195,7 @@ int cam_tfe_top_start(struct cam_tfe_hw_core_info *core_info,
 		in_res->res_state = CAM_ISP_RESOURCE_STATE_STREAMING;
 
 		/* Enable the irq */
-		if (in_res->rdi_only_ctx)
+		if (in_res->is_rdi_primary_res)
 			cam_tfe_irq_config(core_info,
 				rsrc_rdi_data->reg_data->subscribe_irq_mask,
 				CAM_TFE_TOP_IRQ_REG_NUM, true);
@@ -2284,7 +2285,7 @@ int cam_tfe_top_stop(struct cam_tfe_hw_core_info *core_info,
 		cam_io_w_mb(0x0, rsrc_rdi_data->mem_base +
 			rsrc_rdi_data->rdi_reg->rdi_module_config);
 
-		if (in_res->rdi_only_ctx)
+		if (in_res->is_rdi_primary_res)
 			cam_tfe_irq_config(core_info,
 				rsrc_rdi_data->reg_data->subscribe_irq_mask,
 				CAM_TFE_TOP_IRQ_REG_NUM, false);

drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c

@@ -2782,9 +2782,9 @@ static int cam_ope_mgr_acquire_hw(void *hw_priv, void *hw_acquire_args)
 	ctx->ctxt_event_cb = args->event_cb;
 	cam_ope_ctx_clk_info_init(ctx);
 	ctx->ctx_state = OPE_CTX_STATE_ACQUIRED;
-	kzfree(cdm_acquire);
+	kfree(cdm_acquire);
 	cdm_acquire = NULL;
-	kzfree(bw_update);
+	kfree(bw_update);
 	bw_update = NULL;
 
 	mutex_unlock(&ctx->ctx_mutex);

drivers/cam_ope/ope_hw_mgr/ope_hw/ope_dev.c

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -23,7 +24,7 @@
 
 static struct cam_ope_hw_intf_data cam_ope_dev_list[OPE_DEV_MAX];
 static struct cam_ope_device_hw_info ope_hw_info;
-static struct cam_ope_soc_private ope_soc_info;
+struct cam_ope_soc_private ope_soc_info;
 EXPORT_SYMBOL(ope_soc_info);
 
 static struct hw_version_reg ope_hw_version_reg = {