msm: camera: icp: Update OFE AXI BW voting

Update ICP AXI BW voting with new OFE AXI paths.

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

drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

@@ -485,9 +485,10 @@ static inline bool cam_icp_validate_bw_path_idx(
 		return true;
 	} else if (path_idx >= CAM_ICP_MAX_PER_PATH_VOTES) {
 		CAM_WARN(CAM_PERF,
-			"Invalid path: %u start offset: %d, max: %d",
+			"Invalid path: %u IPE start offset: %d, OFE start offset: %d max: %d",
 			path_data_type,
 			CAM_AXI_PATH_DATA_IPE_START_OFFSET,
+			CAM_AXI_PATH_DATA_OFE_START_OFFSET,
 			CAM_ICP_MAX_PER_PATH_VOTES);
 		return true;
 	} else {
@@ -505,7 +506,7 @@ static inline int cam_icp_get_axi_path_index(struct cam_cpas_axi_per_path_bw_vot
 	case CAM_ICP_DEV_IPE:
 		return axi_path->path_data_type - CAM_AXI_PATH_DATA_IPE_START_OFFSET;
 	case CAM_ICP_DEV_OFE:
-		return 0;
+		return axi_path->path_data_type - CAM_AXI_PATH_DATA_OFE_START_OFFSET;
 	default:
 		CAM_ERR(CAM_ICP, "Invalid hw dev type not supported: %u",
 			hw_dev_type);

drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.h

@@ -68,7 +68,7 @@
 #define CAM_ICP_CTX_MAX_CMD_BUFFERS 0x2
 
 /* Current appliacble vote paths, based on number of UAPI definitions */
-#define CAM_ICP_MAX_PER_PATH_VOTES 6
+#define CAM_ICP_MAX_PER_PATH_VOTES 12
 
 #define CAM_ICP_HW_MGR_NAME_SIZE  32
 

drivers/cam_icp/icp_hw/include/cam_icp_hw_mgr_intf.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef CAM_ICP_HW_MGR_INTF_H
@@ -29,7 +29,7 @@
 #define CAM_IPE_DEFAULT_AXI_TRANSAC CAM_AXI_TRANSACTION_WRITE
 #define CAM_BPS_DEFAULT_AXI_PATH    CAM_AXI_PATH_DATA_ALL
 #define CAM_BPS_DEFAULT_AXI_TRANSAC CAM_AXI_TRANSACTION_WRITE
-#define CAM_OFE_DEFAULT_AXI_PATH    CAM_AXI_PATH_DATA_ALL
+#define CAM_OFE_DEFAULT_AXI_PATH    CAM_AXI_PATH_DATA_OFE_WR_VID
 #define CAM_OFE_DEFAULT_AXI_TRANSAC CAM_AXI_TRANSACTION_WRITE
 #define CAM_ICP_DEFAULT_AXI_PATH    CAM_AXI_PATH_DATA_ALL
 #define CAM_ICP_DEFAULT_AXI_TRANSAC CAM_AXI_TRANSACTION_READ