Merge "msm: camera: isp: Enable format measurement in CSID" into camera-kernel.lnx.4.0
This commit is contained in:

committed by
Gerrit - the friendly Code Review server

commit
811d02c493
@@ -94,18 +94,19 @@
|
||||
#define CAM_ISP_DSP_MODE_ROUND 2
|
||||
|
||||
/* ISP Generic Cmd Buffer Blob types */
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_HFR_CONFIG 0
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_CLOCK_CONFIG 1
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_BW_CONFIG 2
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_UBWC_CONFIG 3
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_CSID_CLOCK_CONFIG 4
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_FE_CONFIG 5
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_UBWC_CONFIG_V2 6
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_IFE_CORE_CONFIG 7
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_VFE_OUT_CONFIG 8
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_BW_CONFIG_V2 9
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_CSID_CONFIG 10
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_CSID_QCFA_CONFIG 12
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_HFR_CONFIG 0
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_CLOCK_CONFIG 1
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_BW_CONFIG 2
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_UBWC_CONFIG 3
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_CSID_CLOCK_CONFIG 4
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_FE_CONFIG 5
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_UBWC_CONFIG_V2 6
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_IFE_CORE_CONFIG 7
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_VFE_OUT_CONFIG 8
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_BW_CONFIG_V2 9
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_CSID_CONFIG 10
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_SENSOR_DIMENSION_CONFIG 11
|
||||
#define CAM_ISP_GENERIC_BLOB_TYPE_CSID_QCFA_CONFIG 12
|
||||
|
||||
#define CAM_ISP_VC_DT_CFG 4
|
||||
|
||||
@@ -137,6 +138,8 @@
|
||||
#define CAM_ISP_ACQ_CUSTOM_PRIMARY 1
|
||||
#define CAM_ISP_ACQ_CUSTOM_SECONDARY 2
|
||||
|
||||
#define CAM_IFE_CSID_RDI_MAX 4
|
||||
|
||||
/* Query devices */
|
||||
/**
|
||||
* struct cam_isp_dev_cap_info - A cap info for particular hw type
|
||||
@@ -599,6 +602,37 @@ struct cam_fe_config {
|
||||
__u32 latency_buf_size;
|
||||
} __attribute__((packed));
|
||||
|
||||
|
||||
/**
|
||||
* struct cam_isp_sensor_path_dimension
|
||||
*
|
||||
* @width expected width
|
||||
* @height expected height
|
||||
* @measure_enabled flag to indicate if pixel measurement is to be enabled
|
||||
*/
|
||||
struct cam_isp_sensor_dimension {
|
||||
__u32 width;
|
||||
__u32 height;
|
||||
__u32 measure_enabled;
|
||||
} __attribute__((packed));
|
||||
|
||||
/**
|
||||
* struct cam_isp_sensor_config - Sensor Dimension configuration
|
||||
*
|
||||
* @ppp_path: expected ppp path configuration
|
||||
* @ipp_path: expected ipp path configuration
|
||||
* @rdi_path: expected rdi path configuration
|
||||
* @hbi: HBI value
|
||||
* @vbi: VBI value
|
||||
*/
|
||||
struct cam_isp_sensor_config {
|
||||
struct cam_isp_sensor_dimension ppp_path;
|
||||
struct cam_isp_sensor_dimension ipp_path;
|
||||
struct cam_isp_sensor_dimension rdi_path[CAM_IFE_CSID_RDI_MAX];
|
||||
__u32 hbi;
|
||||
__u32 vbi;
|
||||
} __attribute__((packed));
|
||||
|
||||
/**
|
||||
* struct cam_isp_core_config - ISP core registers configuration
|
||||
*
|
||||
|
Reference in New Issue
Block a user