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

Commit 399f73ac authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: update ISP47 kernel driver"

parents e42f404d a07d0034

drivers/media/platform/msm/camera_v2/isp/msm_isp.h

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 


#define VFE_MAX_CFG_TIMEOUT 3000

#define VFE_CLK_INFO_MAX 16

#define STATS_COMP_BIT_MASK 0xFF0000

#define STATS_COMP_BIT_MASK 0x1FF



#define MSM_ISP_MIN_AB 300000000

#define MSM_ISP_MIN_IB 450000000
@@ -71,6 +71,7 @@ enum msm_isp_pack_fmt { 
	DPCM8,

	PLAIN8,

	PLAIN16,

	DPCM10,

	MAX_ISP_PACK_FMT,

};

drivers/media/platform/msm/camera_v2/isp/msm_isp47.c

+209 −156

File changed.

Preview size limit exceeded, changes collapsed.

include/media/msmb_isp.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ enum msm_isp_stats_type { 
	MSM_ISP_STATS_BF_SCALE,  /* Bayer Focus scale */

	MSM_ISP_STATS_HDR_BE,    /* HDR Bayer Exposure */

	MSM_ISP_STATS_HDR_BHIST, /* HDR Bayer Hist */

	MSM_ISP_STATS_AEC_BG,   /* AEC BG */

	MSM_ISP_STATS_MAX    /* MAX */

};