Merge "msm: camera: cre: Fix typo error for copying blob args" into camera-kernel.lnx.5.0

config/netrani.mk

@@ -4,10 +4,12 @@
 CONFIG_SPECTRA_ISP := y
 CONFIG_SPECTRA_ICP := y
 CONFIG_SPECTRA_TFE := y
+CONFIG_SPECTRA_CRE := y
 CONFIG_SPECTRA_SENSOR := y
 
 # Flags to pass into C preprocessor
 ccflags-y += -DCONFIG_SPECTRA_ISP=1
 ccflags-y += -DCONFIG_SPECTRA_ICP=1
 ccflags-y += -DCONFIG_SPECTRA_TFE=1
+ccflags-y += -DCONFIG_SPECTRA_CRE=1
 ccflags-y += -DCONFIG_SPECTRA_SENSOR=1

drivers/cam_cpas/cam_cpas_intf.c

@@ -113,6 +113,10 @@ const char *cam_cpas_axi_util_path_type_to_string(
 		return "SFE_RDI4";
 	case CAM_AXI_PATH_DATA_SFE_STATS:
 		return "SFE_STATS";
+	case CAM_AXI_PATH_DATA_CRE_RD_IN:
+		return "CRE_RD_IN";
+	case CAM_AXI_PATH_DATA_CRE_WR_OUT:
+		return "CRE_WR_OUT";
 
 	/* Common Paths */
 	case CAM_AXI_PATH_DATA_ALL:

drivers/cam_cre/cam_cre_hw_mgr/cam_cre_hw_mgr.c

@@ -1520,7 +1520,7 @@ static int cam_cre_validate_acquire_res_info(
 			case CAM_FORMAT_MIPI_RAW_12:
 			case CAM_FORMAT_MIPI_RAW_14:
 			case CAM_FORMAT_MIPI_RAW_20:
-			case CAM_FORMAT_PLAIN1128:
+			case CAM_FORMAT_PLAIN128:
 				break;
 			default:
 				CAM_ERR(CAM_CRE, "Invalid input format %d",
@@ -1538,7 +1538,7 @@ static int cam_cre_validate_acquire_res_info(
 			case CAM_FORMAT_PLAIN16_16:
 			case CAM_FORMAT_PLAIN32_20:
 			case CAM_FORMAT_PLAIN32:
-			case CAM_FORMAT_PLAIN1128:
+			case CAM_FORMAT_PLAIN128:
 				break;
 			default:
 				CAM_ERR(CAM_CRE, "Invalid output format %d",
@@ -2077,7 +2077,7 @@ static int cam_cre_packet_generic_blob_handler(void *user_data,
 		clk_info = &ctx_data->req_list[index]->clk_info;
 		clk_info_v2 = &ctx_data->req_list[index]->clk_info_v2;
 
-		memcpy(clk_info, soc_req, clk_update_size);
+		memcpy(clk_info_v2, soc_req, clk_update_size);
 
 		/* Use v2 structure for clk fields */
 		clk_info->budget_ns = clk_info_v2->budget_ns;

drivers/cam_cre/cam_cre_hw_mgr/cam_cre_hw_mgr.h

@@ -41,7 +41,7 @@
 #define CRE_DEVICE_IDLE_TIMEOUT      400
 #define CRE_REQUEST_TIMEOUT          200
 
-#define CAM_CRE_MAX_PER_PATH_VOTES   6
+#define CAM_CRE_MAX_PER_PATH_VOTES   2
 #define CAM_CRE_MAX_REG_SET          32
 
 #define CAM_CRE_MAX_ACTIVE           8