From 6aa27c964fea21e6ac85ac6b25aef527c967db77 Mon Sep 17 00:00:00 2001 From: Depeng Shao Date: Mon, 14 Aug 2023 10:06:40 +0530 Subject: [PATCH] msm: camera: isp: Update acquired HW id for SFE2 This change adds sfe hw id 2 as valid hw id, then sfe 2 info can be returned to userspace correctly. CRs-Fixed: 3587713 Change-Id: I01825040837be4e1df204d7fe1c27887af3900e5 Signed-off-by: Depeng Shao (cherry picked from commit 9668c0f7a7963d6a6a43a6bb2352aa5b76201a83) --- drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c | 1 + include/uapi/camera/media/cam_isp.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c b/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c index c5363d3f2c..03651485e4 100644 --- a/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c +++ b/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c @@ -2687,6 +2687,7 @@ static int cam_convert_hw_idx_to_sfe_hw_num(int hw_idx) switch (hw_idx) { case 0: return CAM_ISP_SFE0_HW; case 1: return CAM_ISP_SFE1_HW; + case 2: return CAM_ISP_SFE2_HW; } } else { CAM_ERR(CAM_ISP, "SFE hw idx %d out-of-bounds max available %u", diff --git a/include/uapi/camera/media/cam_isp.h b/include/uapi/camera/media/cam_isp.h index dd11871bf4..75738c01ac 100644 --- a/include/uapi/camera/media/cam_isp.h +++ b/include/uapi/camera/media/cam_isp.h @@ -152,6 +152,7 @@ #define CAM_ISP_IFE2_HW 0x100 #define CAM_ISP_SFE0_HW 0x1000 #define CAM_ISP_SFE1_HW 0x2000 +#define CAM_ISP_SFE2_HW 0x4000 #define CAM_ISP_PXL_PATH 0x1 #define CAM_ISP_PPP_PATH 0x2