Merge "coral: update kernel-and-modules prebuilt" into rvc-dev am: ef85f812e3

Change-Id: I5b9b199efb868cc968687296b44f8c730663b47c

5 files changed, 104 insertions, 14 deletions

diff --git a/sm8150/kernel-headers/linux/ipa_qmi_service_v01.h b/sm8150/kernel-headers/linux/ipa_qmi_service_v01.h
index f4598938e..06b4dccdb 100644
--- a/sm8150/kernel-headers/linux/ipa_qmi_service_v01.h
+++ b/sm8150/kernel-headers/linux/ipa_qmi_service_v01.h
@@ -709,6 +709,8 @@ enum ipa_ep_desc_type_enum_v01 {
   DATA_EP_DESC_TYPE_TETH_PROD_V01 = 0x07,
   DATA_EP_DESC_TYPE_TETH_RMNET_CONS_V01 = 0x08,
   DATA_EP_DESC_TYPE_TETH_RMNET_PROD_V01 = 0x09,
+  DATA_EP_DESC_TYPE_EMB_FLOW_CTL_CONS_V01 = 0x0A,
+  DATA_EP_DESC_TYPE_EMB_FLOW_CTL_PROD_V01 = 0x0B,
   IPA_EP_DESC_TYPE_ENUM_MAX_VAL_V01 = IPA_INT_MAX,
 };
 enum ipa_ic_type_enum_v01 {
diff --git a/sm8150/kernel-headers/linux/msm_ion.h b/sm8150/kernel-headers/linux/msm_ion.h
index fa2a6f997..10ca03264 100644
--- a/sm8150/kernel-headers/linux/msm_ion.h
+++ b/sm8150/kernel-headers/linux/msm_ion.h
@@ -33,6 +33,7 @@ enum ion_heap_ids {
   ION_CP_MM_HEAP_ID = 8,
   ION_SECURE_HEAP_ID = 9,
   ION_SECURE_DISPLAY_HEAP_ID = 10,
+  ION_VIDEO_HEAP_ID = 12,
   ION_SPSS_HEAP_ID = 13,
   ION_ADSP_HEAP_ID = 22,
   ION_SYSTEM_HEAP_ID = 25,
@@ -44,6 +45,7 @@ enum ion_heap_ids {
 #define ION_AUDIO_HEAP_ID 28
 #define ION_CAMERA_HEAP_ID 20
 #define ION_USER_CONTIG_HEAP_ID 26
+#define ION_FLAG_CP_CAMERA_ENCODE ION_BIT(14)
 #define ION_FLAG_CP_DSP_EXT ION_BIT(15)
 #define ION_FLAG_CP_TOUCH ION_BIT(17)
 #define ION_FLAG_CP_BITSTREAM ION_BIT(18)
@@ -58,7 +60,7 @@ enum ion_heap_ids {
 #define ION_FLAG_CP_CAMERA_PREVIEW ION_BIT(27)
 #define ION_FLAG_CP_CDSP ION_BIT(29)
 #define ION_FLAG_CP_SPSS_HLOS_SHARED ION_BIT(30)
-#define ION_FLAGS_CP_MASK 0x6FFE8000
+#define ION_FLAGS_CP_MASK 0x6FFEC000
 #define ION_FLAG_ALLOW_NON_CONTIG ION_BIT(28)
 #define ION_FLAG_SECURE ION_BIT(ION_HEAP_ID_RESERVED)
 #define ION_FLAG_POOL_FORCE_ALLOC ION_BIT(16)
diff --git a/sm8150/kernel-headers/linux/msm_ipa.h b/sm8150/kernel-headers/linux/msm_ipa.h
index 9c21eecd5..9f5605196 100644
--- a/sm8150/kernel-headers/linux/msm_ipa.h
+++ b/sm8150/kernel-headers/linux/msm_ipa.h
@@ -161,7 +161,8 @@
 #define IPA_FLT_EXT_L2TP_UDP_INNER_ETHER_TYPE (1ul << 1)
 #define IPA_FLT_EXT_MTU (1ul << 2)
 #define IPA_FLT_EXT_L2TP_UDP_INNER_NEXT_HDR (1ul << 3)
-#define IPA_MAX_PDN_NUM 5
+#define IPA_FLT_EXT_NEXT_HDR (1ul << 4)
+#define IPA_MAX_PDN_NUM 7
 enum ipa_client_type {
   IPA_CLIENT_HSIC1_PROD = 0,
   IPA_CLIENT_HSIC1_CONS = 1,
@@ -258,8 +259,11 @@ enum ipa_client_type {
   IPA_CLIENT_MHI2_CONS = 105,
   IPA_CLIENT_Q6_CV2X_PROD = 106,
   IPA_CLIENT_Q6_CV2X_CONS = 107,
+  IPA_CLIENT_MHI_LOW_LAT_PROD = 108,
+  IPA_CLIENT_MHI_LOW_LAT_CONS = 109,
+  IPA_CLIENT_MHI_QDSS_CONS = 111,
 };
-#define IPA_CLIENT_MAX (IPA_CLIENT_Q6_CV2X_CONS + 1)
+#define IPA_CLIENT_MAX (IPA_CLIENT_MHI_QDSS_CONS + 1)
 #define IPA_CLIENT_WLAN2_PROD IPA_CLIENT_A5_WLAN_AMPDU_PROD
 #define IPA_CLIENT_Q6_DL_NLO_DATA_PROD IPA_CLIENT_Q6_DL_NLO_DATA_PROD
 #define IPA_CLIENT_Q6_UL_NLO_ACK_CONS IPA_CLIENT_Q6_UL_NLO_ACK_CONS
@@ -279,6 +283,7 @@ enum ipa_client_type {
 #define IPA_CLIENT_MHI_PRIME_RMNET_PROD IPA_CLIENT_MHI_PRIME_RMNET_PROD
 #define IPA_CLIENT_MHI_PRIME_RMNET_CONS IPA_CLIENT_MHI_PRIME_RMNET_CONS
 #define IPA_CLIENT_MHI_PRIME_DPL_PROD IPA_CLIENT_MHI_PRIME_DPL_PROD
+#define IPA_CLIENT_MHI_QDSS_CONS IPA_CLIENT_MHI_QDSS_CONS
 #define IPA_CLIENT_IS_APPS_CONS(client) ((client) == IPA_CLIENT_APPS_LAN_CONS || (client) == IPA_CLIENT_APPS_WAN_CONS || (client) == IPA_CLIENT_APPS_WAN_COAL_CONS)
 #define IPA_CLIENT_IS_APPS_PROD(client) ((client) == IPA_CLIENT_APPS_LAN_PROD || (client) == IPA_CLIENT_APPS_WAN_PROD)
 #define IPA_CLIENT_IS_USB_CONS(client) ((client) == IPA_CLIENT_USB_CONS || (client) == IPA_CLIENT_USB2_CONS || (client) == IPA_CLIENT_USB3_CONS || (client) == IPA_CLIENT_USB_DPL_CONS || (client) == IPA_CLIENT_USB4_CONS)
@@ -293,7 +298,7 @@ enum ipa_client_type {
 #define IPA_CLIENT_IS_Q6_ZIP_PROD(client) ((client) == IPA_CLIENT_Q6_DECOMP_PROD || (client) == IPA_CLIENT_Q6_DECOMP2_PROD)
 #define IPA_CLIENT_IS_MEMCPY_DMA_CONS(client) ((client) == IPA_CLIENT_MEMCPY_DMA_SYNC_CONS || (client) == IPA_CLIENT_MEMCPY_DMA_ASYNC_CONS)
 #define IPA_CLIENT_IS_MEMCPY_DMA_PROD(client) ((client) == IPA_CLIENT_MEMCPY_DMA_SYNC_PROD || (client) == IPA_CLIENT_MEMCPY_DMA_ASYNC_PROD)
-#define IPA_CLIENT_IS_MHI(client) ((client) == IPA_CLIENT_MHI_CONS || (client) == IPA_CLIENT_MHI_PROD || (client) == IPA_CLIENT_MHI2_PROD || (client) == IPA_CLIENT_MHI2_CONS || (client) == IPA_CLIENT_MHI_DPL_CONS)
+#define IPA_CLIENT_IS_MHI(client) ((client) == IPA_CLIENT_MHI_CONS || (client) == IPA_CLIENT_MHI_PROD || (client) == IPA_CLIENT_MHI2_PROD || (client) == IPA_CLIENT_MHI2_CONS || (client) == IPA_CLIENT_MHI_LOW_LAT_PROD || (client) == IPA_CLIENT_MHI_LOW_LAT_CONS || (client) == IPA_CLIENT_MHI_DPL_CONS || (client) == IPA_CLIENT_MHI_QDSS_CONS)
 #define IPA_CLIENT_IS_TEST_PROD(client) ((client) == IPA_CLIENT_TEST_PROD || (client) == IPA_CLIENT_TEST1_PROD || (client) == IPA_CLIENT_TEST2_PROD || (client) == IPA_CLIENT_TEST3_PROD || (client) == IPA_CLIENT_TEST4_PROD)
 #define IPA_CLIENT_IS_TEST_CONS(client) ((client) == IPA_CLIENT_TEST_CONS || (client) == IPA_CLIENT_TEST1_CONS || (client) == IPA_CLIENT_TEST2_CONS || (client) == IPA_CLIENT_TEST3_CONS || (client) == IPA_CLIENT_TEST4_CONS)
 #define IPA_CLIENT_IS_TEST(client) (IPA_CLIENT_IS_TEST_PROD(client) || IPA_CLIENT_IS_TEST_CONS(client))
@@ -1033,6 +1038,7 @@ struct ipa_ioc_l2tp_vlan_mapping_info {
   enum ipa_l2tp_tunnel_type tunnel_type;
   uint16_t src_port;
   uint16_t dst_port;
+  uint16_t mtu;
 };
 struct ipa_ioc_gsb_info {
   char name[IPA_RESOURCE_NAME_MAX];
@@ -1050,6 +1056,11 @@ enum ipa_peripheral_ep_type {
   IPA_DATA_EP_TYP_EMBEDDED = 4,
   IPA_DATA_EP_TYP_BAM_DMUX,
 };
+enum ipa_data_ep_prot_type {
+  IPA_PROT_RMNET = 0,
+  IPA_PROT_RMNET_CV2X = 1,
+  IPA_PROT_MAX
+};
 struct ipa_ep_pair_info {
   uint32_t consumer_pipe_num;
   uint32_t producer_pipe_num;
@@ -1061,6 +1072,8 @@ struct ipa_ioc_get_ep_info {
   uint8_t num_ep_pairs;
   uint32_t ep_pair_size;
   uintptr_t info;
+  enum ipa_data_ep_prot_type teth_prot;
+  uint8_t teth_prot_valid;
 };
 struct ipa_ioc_wigig_fst_switch {
   uint8_t netdev_name[IPA_RESOURCE_NAME_MAX];
diff --git a/sm8150/kernel-headers/linux/msm_mdp.h b/sm8150/kernel-headers/linux/msm_mdp.h
index 60bd7af9d..20a916ecb 100644
--- a/sm8150/kernel-headers/linux/msm_mdp.h
+++ b/sm8150/kernel-headers/linux/msm_mdp.h
@@ -100,6 +100,7 @@
 #define MDSS_MDP_HW_REV_300 MDSS_MDP_REV(3, 0, 0)
 #define MDSS_MDP_HW_REV_301 MDSS_MDP_REV(3, 0, 1)
 #define MDSS_MDP_HW_REV_320 MDSS_MDP_REV(3, 2, 0)
+#define MDSS_MDP_HW_REV_330 MDSS_MDP_REV(3, 3, 0)
 enum {
   NOTIFY_UPDATE_INIT,
   NOTIFY_UPDATE_DEINIT,
diff --git a/sm8150/kernel-headers/linux/msm_mdp_ext.h b/sm8150/kernel-headers/linux/msm_mdp_ext.h
index 444d04463..e57c7818c 100644
--- a/sm8150/kernel-headers/linux/msm_mdp_ext.h
+++ b/sm8150/kernel-headers/linux/msm_mdp_ext.h
@@ -23,10 +23,11 @@
 #define MSMFB_ATOMIC_COMMIT _IOWR(MDP_IOCTL_MAGIC, 128, void *)
 #define MSMFB_ASYNC_POSITION_UPDATE _IOWR(MDP_IOCTL_MAGIC, 129, struct mdp_position_update)
 #define MSMFB_MDP_SET_CFG _IOW(MDP_IOCTL_MAGIC, 130, struct mdp_set_cfg)
+#define MSMFB_MDP_SET_PANEL_PPM _IOW(MDP_IOCTL_MAGIC, 131, int)
 #ifdef __LP64
-#define MDP_LAYER_COMMIT_V1_PAD 1
-#else
 #define MDP_LAYER_COMMIT_V1_PAD 2
+#else
+#define MDP_LAYER_COMMIT_V1_PAD 3
 #endif
 #define MDP_LAYER_FLIP_LR 0x1
 #define MDP_LAYER_FLIP_UD 0x2
@@ -46,15 +47,65 @@
 #define MDP_DESTSCALER_ENABLE 0x1
 #define MDP_DESTSCALER_SCALE_UPDATE 0x2
 #define MDP_DESTSCALER_ENHANCER_UPDATE 0x4
+#define MDP_DESTSCALER_ROI_ENABLE 0x8
 #define MDP_VALIDATE_LAYER 0x01
 #define MDP_COMMIT_WAIT_FOR_FINISH 0x02
 #define MDP_COMMIT_SYNC_FENCE_WAIT 0x04
 #define MDP_COMMIT_AVR_EN 0x08
 #define MDP_COMMIT_AVR_ONE_SHOT_MODE 0x10
+#define MDP_COMMIT_PARTIAL_UPDATE_DUAL_ROI 0x20
 #define MDP_COMMIT_UPDATE_BRIGHTNESS 0x40
 #define MDP_COMMIT_CWB_EN 0x800
 #define MDP_COMMIT_CWB_DSPP 0x1000
+#define MDP_COMMIT_RECT_NUM 0x2000
 #define MDP_COMMIT_VERSION_1_0 0x00010000
+#define OUT_LAYER_COLOR_SPACE
+#define MDP_HDR_EOTF_SMTPE_ST2084 0x2
+#define MDP_HDR_EOTF_HLG 0x3
+#define MDP_PIXEL_ENCODING_RGB 0x0
+#define MDP_PIXEL_ENCODING_YCBCR_444 0x1
+#define MDP_PIXEL_ENCODING_YCBCR_422 0x2
+#define MDP_PIXEL_ENCODING_YCBCR_420 0x3
+#define MDP_PIXEL_ENCODING_Y_ONLY 0x4
+#define MDP_PIXEL_ENCODING_RAW 0x5
+#define MDP_COLORIMETRY_RGB_SRGB 0x0
+#define MDP_COLORIMETRY_RGB_WIDE_FIXED_POINT 0x1
+#define MDP_COLORIMETRY_RGB_WIDE_FLOAT_POINT 0x2
+#define MDP_COLORIMETRY_RGB_ADOBE 0x3
+#define MDP_COLORIMETRY_RGB_DPI_P3 0x4
+#define MDP_COLORIMETRY_RGB_CUSTOM 0x5
+#define MDP_COLORIMETRY_RGB_ITU_R_BT_2020 0x6
+#define MDP_COLORIMETRY_YCBCR_ITU_R_BT_601 0x0
+#define MDP_COLORIMETRY_YCBCR_ITU_R_BT_709 0x1
+#define MDP_COLORIMETRY_YCBCR_XV_YCC_601 0x2
+#define MDP_COLORIMETRY_YCBCR_XV_YCC_709 0x3
+#define MDP_COLORIMETRY_YCBCR_S_YCC_601 0x4
+#define MDP_COLORIMETRY_YCBCR_ADOBE_YCC_601 0x5
+#define MDP_COLORIMETRY_YCBCR_ITU_R_BT_2020_YCBCR_CONST 0x6
+#define MDP_COLORIMETRY_YCBCR_ITU_R_BT_2020_YCBCR 0x7
+#define MDP_DYNAMIC_RANGE_VESA 0x0
+#define MDP_DYNAMIC_RANGE_CEA 0x1
+#define MDP_RGB_6_BPC 0x0
+#define MDP_RGB_8_BPC 0x1
+#define MDP_RGB_10_BPC 0x2
+#define MDP_RGB_12_BPC 0x3
+#define MDP_RGB_16_BPC 0x4
+#define MDP_YUV_8_BPC 0x1
+#define MDP_YUV_10_BPC 0x2
+#define MDP_YUV_12_BPC 0x3
+#define MDP_YUV_16_BPC 0x4
+#define MDP_RAW_6_BPC 0x1
+#define MDP_RAW_7_BPC 0x2
+#define MDP_RAW_8_BPC 0x3
+#define MDP_RAW_10_BPC 0x4
+#define MDP_RAW_12_BPC 0x5
+#define MDP_RAW_14_BPC 0x6
+#define MDP_RAW16_BPC 0x7
+#define MDP_CONTENT_TYPE_NOT_DEFINED 0x0
+#define MDP_CONTENT_TYPE_GRAPHICS 0x1
+#define MDP_CONTENT_TYPE_PHOTO 0x2
+#define MDP_CONTENT_TYPE_VIDEO 0x3
+#define MDP_CONTENT_TYPE_GAME 0x4
 struct mdp_layer_plane {
   int fd;
   uint32_t offset;
@@ -87,7 +138,8 @@ struct mdp_input_layer {
   struct mdp_layer_buffer buffer;
   void * pp_info;
   int error_code;
-  uint32_t reserved[6];
+  uint32_t rect_num;
+  uint32_t reserved[5];
 };
 struct mdp_output_layer {
   uint32_t flags;
@@ -102,12 +154,7 @@ struct mdp_destination_scaler_data {
   uint32_t lm_width;
   uint32_t lm_height;
   uint64_t scale;
-};
-#define MDP_VIDEO_FRC_ENABLE (1 << 0)
-struct mdp_frc_info {
-  uint32_t flags;
-  uint32_t frame_cnt;
-  int64_t timestamp;
+  struct mdp_rect panel_roi;
 };
 struct mdp_layer_commit_v1 {
   uint32_t flags;
@@ -120,7 +167,6 @@ struct mdp_layer_commit_v1 {
   int retire_fence;
   void * dest_scaler;
   uint32_t dest_scaler_cnt;
-  struct mdp_frc_info * frc_info;
   uint32_t bl_level;
   uint32_t reserved[MDP_LAYER_COMMIT_V1_PAD];
 };
@@ -229,4 +275,30 @@ struct mdp_set_cfg {
   uint32_t len;
   uint64_t payload;
 };
+#define HDR_PRIMARIES_COUNT 3
+#define MDP_HDR_STREAM
+struct mdp_hdr_stream {
+  uint32_t eotf;
+  uint32_t display_primaries_x[HDR_PRIMARIES_COUNT];
+  uint32_t display_primaries_y[HDR_PRIMARIES_COUNT];
+  uint32_t white_point_x;
+  uint32_t white_point_y;
+  uint32_t max_luminance;
+  uint32_t min_luminance;
+  uint32_t max_content_light_level;
+  uint32_t max_average_light_level;
+  uint32_t pixel_encoding;
+  uint32_t colorimetry;
+  uint32_t range;
+  uint32_t bits_per_component;
+  uint32_t content_type;
+  uint32_t reserved[5];
+};
+#define HDR_ENABLE (1 << 0)
+#define HDR_DISABLE (1 << 1)
+#define HDR_RESET (1 << 2)
+struct mdp_hdr_stream_ctrl {
+  __u8 hdr_state;
+  struct mdp_hdr_stream hdr_stream;
+};
 #endif