Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40775fbe authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: ife: Support max 7 cameras streaming on XR2" into camera-kernel.lnx.1.0

parents 54b8d694 dcaaa6cd

drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -1335,6 +1335,10 @@ static int cam_convert_hw_idx_to_ife_hw_num(int hw_idx) 
				return CAM_ISP_IFE1_LITE_HW;

				return CAM_ISP_IFE1_LITE_HW;

			else if (hw_idx == 4)

			else if (hw_idx == 4)

				return CAM_ISP_IFE2_LITE_HW;

				return CAM_ISP_IFE2_LITE_HW;

			else if (hw_idx == 5)

				return CAM_ISP_IFE3_LITE_HW;

			else if (hw_idx == 6)

				return CAM_ISP_IFE4_LITE_HW;

			break;

			break;

		case CAM_CPAS_TITAN_170_V200:

		case CAM_CPAS_TITAN_170_V200:

			if (hw_idx == 0)

			if (hw_idx == 0)

drivers/cam_req_mgr/cam_req_mgr_core.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ 




#define SYNC_LINK_SOF_CNT_MAX_LMT 1

#define SYNC_LINK_SOF_CNT_MAX_LMT 1





#define MAXIMUM_LINKS_PER_SESSION  4

#define MAXIMUM_LINKS_PER_SESSION  7





#define MAXIMUM_RETRY_ATTEMPTS 2

#define MAXIMUM_RETRY_ATTEMPTS 2

include/uapi/media/cam_isp.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -113,6 +113,8 @@ 
#define CAM_ISP_IFE0_LITE_HW     0x4

#define CAM_ISP_IFE0_LITE_HW     0x4

#define CAM_ISP_IFE1_LITE_HW     0x8

#define CAM_ISP_IFE1_LITE_HW     0x8

#define CAM_ISP_IFE2_LITE_HW     0x10

#define CAM_ISP_IFE2_LITE_HW     0x10

#define CAM_ISP_IFE3_LITE_HW     0x20

#define CAM_ISP_IFE4_LITE_HW     0x40

#define CAM_ISP_IFE2_HW          0x100

#define CAM_ISP_IFE2_HW          0x100





#define CAM_ISP_PXL_PATH          0x1

#define CAM_ISP_PXL_PATH          0x1