diff --git a/kernel-headers/media/msm_vidc.h b/kernel-headers/media/msm_vidc.h
index 0486cd0..9058f57 100644
--- a/kernel-headers/media/msm_vidc.h
+++ b/kernel-headers/media/msm_vidc.h
@@ -20,407 +20,331 @@
 #define __MSM_VIDC_H__
 #include <linux/types.h>
 #define MSM_VIDC_HAL_INTERLACE_COLOR_FORMAT_NV12 0x2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define MSM_VIDC_HAL_INTERLACE_COLOR_FORMAT_NV12_UBWC 0x8002
 struct msm_vidc_extradata_header {
   unsigned int size;
   unsigned int : 32;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int : 32;
   unsigned int type;
   unsigned int data_size;
   unsigned char data[1];
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 };
 struct msm_vidc_interlace_payload {
   unsigned int format;
   unsigned int color_format;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 };
 struct msm_vidc_framerate_payload {
   unsigned int frame_rate;
 };
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 struct msm_vidc_ts_payload {
   unsigned int timestamp_lo;
   unsigned int timestamp_hi;
 };
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 struct msm_vidc_concealmb_payload {
   unsigned int num_mbs;
 };
 struct msm_vidc_recoverysei_payload {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int flags;
 };
 struct msm_vidc_aspect_ratio_payload {
   unsigned int size;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int version;
   unsigned int port_index;
   unsigned int aspect_width;
   unsigned int aspect_height;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 };
 struct msm_vidc_mpeg2_seqdisp_payload {
   unsigned int video_format;
   unsigned int color_descp;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int color_primaries;
   unsigned int transfer_char;
   unsigned int matrix_coeffs;
   unsigned int disp_width;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int disp_height;
 };
 struct msm_vidc_vc1_seqdisp_payload {
   unsigned int prog_seg_format;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int uv_sampl_fmt;
   unsigned int color_format;
   unsigned int color_primaries;
   unsigned int transfer_char;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int matrix_coeffs;
   unsigned int aspect_ratio;
   unsigned int aspect_horiz;
   unsigned int aspect_vert;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 };
 struct msm_vidc_input_crop_payload {
   unsigned int size;
   unsigned int version;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int port_index;
   unsigned int left;
   unsigned int top;
   unsigned int width;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int height;
 };
 struct msm_vidc_output_crop_payload {
   unsigned int size;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int version;
   unsigned int port_index;
   unsigned int left;
   unsigned int top;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int display_width;
   unsigned int display_height;
   unsigned int width;
   unsigned int height;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 };
 struct msm_vidc_digital_zoom_payload {
   unsigned int size;
   unsigned int version;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int port_index;
   unsigned int zoom_width;
   unsigned int zoom_height;
 };
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 struct msm_vidc_extradata_index {
   unsigned int type;
   union {
     struct msm_vidc_input_crop_payload input_crop;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
     struct msm_vidc_digital_zoom_payload digital_zoom;
     struct msm_vidc_aspect_ratio_payload aspect_ratio;
   };
 };
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 struct msm_vidc_panscan_window {
   unsigned int panscan_height_offset;
   unsigned int panscan_width_offset;
   unsigned int panscan_window_width;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int panscan_window_height;
 };
 struct msm_vidc_panscan_window_payload {
   unsigned int num_panscan_windows;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   struct msm_vidc_panscan_window wnd[1];
 };
 struct msm_vidc_stream_userdata_payload {
   unsigned int type;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int data[1];
 };
 struct msm_vidc_frame_qp_payload {
   unsigned int frame_qp;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 };
 struct msm_vidc_frame_bits_info_payload {
   unsigned int frame_bits;
   unsigned int header_bits;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 };
 struct msm_vidc_s3d_frame_packing_payload {
   unsigned int fpa_id;
   unsigned int cancel_flag;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int fpa_type;
   unsigned int quin_cunx_flag;
   unsigned int content_interprtation_type;
   unsigned int spatial_flipping_flag;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int frame0_flipped_flag;
   unsigned int field_views_flag;
   unsigned int current_frame_is_frame0_flag;
   unsigned int frame0_self_contained_flag;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int frame1_self_contained_flag;
   unsigned int frame0_graid_pos_x;
   unsigned int frame0_graid_pos_y;
   unsigned int frame1_graid_pos_x;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int frame1_graid_pos_y;
   unsigned int fpa_reserved_byte;
   unsigned int fpa_repetition_period;
   unsigned int fpa_extension_flag;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 };
 struct msm_vidc_vqzip_sei_payload {
   unsigned int size;
   unsigned int data[1];
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 };
 struct msm_vidc_yuv_stats_payload {
   unsigned int frame_qp;
   unsigned int texture;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int luma_in_q16;
   unsigned int frame_difference;
 };
 struct msm_vidc_vpx_colorspace_payload {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int color_space;
   unsigned int yuv_range_flag;
   unsigned int sumsampling_x;
   unsigned int sumsampling_y;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 };
 struct msm_vidc_roi_qp_payload {
   int upper_qp_offset;
   int lower_qp_offset;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int b_roi_info;
   int mbi_info_size;
   unsigned int data[1];
 };
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 struct msm_vidc_mastering_display_colour_sei_payload {
   unsigned int nDisplayPrimariesX[3];
   unsigned int nDisplayPrimariesY[3];
   unsigned int nWhitePointX;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int nWhitePointY;
   unsigned int nMaxDisplayMasteringLuminance;
   unsigned int nMinDisplayMasteringLuminance;
 };
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 struct msm_vidc_content_light_level_sei_payload {
   unsigned int nMaxContentLight;
   unsigned int nMaxPicAverageLight;
 };
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 struct msm_vidc_vui_display_info_payload {
   unsigned int video_signal_present_flag;
   unsigned int video_format;
   unsigned int bit_depth_y;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int bit_depth_c;
   unsigned int video_full_range_flag;
   unsigned int color_description_present_flag;
   unsigned int color_primaries;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int transfer_characteristics;
   unsigned int matrix_coefficients;
   unsigned int chroma_location_info_present_flag;
   unsigned int chroma_format_idc;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   unsigned int separate_color_plane_flag;
   unsigned int chroma_sample_loc_type_top_field;
   unsigned int chroma_sample_loc_type_bottom_field;
 };
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 enum msm_vidc_extradata_type {
   MSM_VIDC_EXTRADATA_NONE = 0x00000000,
   MSM_VIDC_EXTRADATA_MB_QUANTIZATION = 0x00000001,
   MSM_VIDC_EXTRADATA_INTERLACE_VIDEO = 0x00000002,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_EXTRADATA_VC1_FRAMEDISP = 0x00000003,
   MSM_VIDC_EXTRADATA_VC1_SEQDISP = 0x00000004,
   MSM_VIDC_EXTRADATA_TIMESTAMP = 0x00000005,
   MSM_VIDC_EXTRADATA_S3D_FRAME_PACKING = 0x00000006,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_EXTRADATA_FRAME_RATE = 0x00000007,
   MSM_VIDC_EXTRADATA_PANSCAN_WINDOW = 0x00000008,
   MSM_VIDC_EXTRADATA_RECOVERY_POINT_SEI = 0x00000009,
   MSM_VIDC_EXTRADATA_MPEG2_SEQDISP = 0x0000000D,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_EXTRADATA_STREAM_USERDATA = 0x0000000E,
   MSM_VIDC_EXTRADATA_FRAME_QP = 0x0000000F,
   MSM_VIDC_EXTRADATA_FRAME_BITS_INFO = 0x00000010,
   MSM_VIDC_EXTRADATA_VQZIP_SEI = 0x00000011,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_EXTRADATA_ROI_QP = 0x00000013,
 #define MSM_VIDC_EXTRADATA_MASTERING_DISPLAY_COLOUR_SEI MSM_VIDC_EXTRADATA_MASTERING_DISPLAY_COLOUR_SEI
   MSM_VIDC_EXTRADATA_MASTERING_DISPLAY_COLOUR_SEI = 0x00000015,
 #define MSM_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI MSM_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI = 0x00000016,
 #define MSM_VIDC_EXTRADATA_PQ_INFO MSM_VIDC_EXTRADATA_PQ_INFO
   MSM_VIDC_EXTRADATA_PQ_INFO = 0x00000017,
   MSM_VIDC_EXTRADATA_INPUT_CROP = 0x0700000E,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define MSM_VIDC_EXTRADATA_OUTPUT_CROP MSM_VIDC_EXTRADATA_OUTPUT_CROP
   MSM_VIDC_EXTRADATA_OUTPUT_CROP = 0x0700000F,
   MSM_VIDC_EXTRADATA_DIGITAL_ZOOM = 0x07000010,
 #define MSM_VIDC_EXTRADATA_VPX_COLORSPACE_INFO MSM_VIDC_EXTRADATA_VPX_COLORSPACE_INFO
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_EXTRADATA_VPX_COLORSPACE_INFO = 0x00000014,
   MSM_VIDC_EXTRADATA_MULTISLICE_INFO = 0x7F100000,
   MSM_VIDC_EXTRADATA_NUM_CONCEALED_MB = 0x7F100001,
   MSM_VIDC_EXTRADATA_INDEX = 0x7F100002,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_EXTRADATA_ASPECT_RATIO = 0x7F100003,
   MSM_VIDC_EXTRADATA_METADATA_LTR = 0x7F100004,
   MSM_VIDC_EXTRADATA_METADATA_FILLER = 0x7FE00002,
   MSM_VIDC_EXTRADATA_METADATA_MBI = 0x7F100005,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define MSM_VIDC_EXTRADATA_VUI_DISPLAY_INFO MSM_VIDC_EXTRADATA_VUI_DISPLAY_INFO
   MSM_VIDC_EXTRADATA_VUI_DISPLAY_INFO = 0x7F100006,
   MSM_VIDC_EXTRADATA_YUVSTATS_INFO = 0x7F100007,
 };
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 enum msm_vidc_interlace_type {
   MSM_VIDC_INTERLACE_FRAME_PROGRESSIVE = 0x01,
   MSM_VIDC_INTERLACE_INTERLEAVE_FRAME_TOPFIELDFIRST = 0x02,
   MSM_VIDC_INTERLACE_INTERLEAVE_FRAME_BOTTOMFIELDFIRST = 0x04,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_INTERLACE_FRAME_TOPFIELDFIRST = 0x08,
   MSM_VIDC_INTERLACE_FRAME_BOTTOMFIELDFIRST = 0x10,
 };
 #define MSM_VIDC_FRAMEPACK_CHECKERBOARD 0x00
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define MSM_VIDC_FRAMEPACK_COLUMN_INTERLEAVE 0x01
 #define MSM_VIDC_FRAMEPACK_ROW_INTERLEAVE 0x02
 #define MSM_VIDC_FRAMEPACK_SIDE_BY_SIDE 0x03
 #define MSM_VIDC_FRAMEPACK_TOP_BOTTOM 0x04
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define MSM_VIDC_FRAMEPACK_TEMPORAL_INTERLEAVE 0x05
 enum msm_vidc_recovery_sei {
   MSM_VIDC_FRAME_RECONSTRUCTION_INCORRECT = 0x0,
   MSM_VIDC_FRAME_RECONSTRUCTION_CORRECT = 0x01,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_FRAME_RECONSTRUCTION_APPROXIMATELY_CORRECT = 0x02,
 };
 enum msm_vidc_userdata_type {
   MSM_VIDC_USERDATA_TYPE_FRAME = 0x1,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_USERDATA_TYPE_TOP_FIELD = 0x2,
   MSM_VIDC_USERDATA_TYPE_BOTTOM_FIELD = 0x3,
 };
 enum msm_vidc_h264_color_primaries_values {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_RESERVED_1 = 0,
   MSM_VIDC_BT709_5 = 1,
   MSM_VIDC_UNSPECIFIED = 2,
   MSM_VIDC_RESERVED_2 = 3,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_BT470_6_M = 4,
   MSM_VIDC_BT601_6_625 = 5,
   MSM_VIDC_BT470_6_BG = MSM_VIDC_BT601_6_625,
   MSM_VIDC_BT601_6_525 = 6,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_SMPTE_240M = 7,
   MSM_VIDC_GENERIC_FILM = 8,
   MSM_VIDC_BT2020 = 9,
 };
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 enum msm_vidc_vp9_color_primaries_values {
   MSM_VIDC_CS_UNKNOWN,
   MSM_VIDC_CS_BT_601,
   MSM_VIDC_CS_BT_709,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_CS_SMPTE_170,
   MSM_VIDC_CS_SMPTE_240,
   MSM_VIDC_CS_BT_2020,
   MSM_VIDC_CS_RESERVED,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_CS_RGB,
 };
 enum msm_vidc_h264_matrix_coeff_values {
   MSM_VIDC_MATRIX_RGB = 0,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_MATRIX_BT_709_5 = 1,
   MSM_VIDC_MATRIX_UNSPECIFIED = 2,
   MSM_VIDC_MATRIX_RESERVED = 3,
   MSM_VIDC_MATRIX_FCC_47 = 4,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_MATRIX_601_6_625 = 5,
   MSM_VIDC_MATRIX_BT470_BG = MSM_VIDC_MATRIX_601_6_625,
   MSM_VIDC_MATRIX_601_6_525 = 6,
   MSM_VIDC_MATRIX_SMPTE_170M = MSM_VIDC_MATRIX_601_6_525,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_MATRIX_SMPTE_240M = 7,
   MSM_VIDC_MATRIX_Y_CG_CO = 8,
   MSM_VIDC_MATRIX_BT_2020 = 9,
   MSM_VIDC_MATRIX_BT_2020_CONST = 10,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 };
 enum msm_vidc_h264_transfer_chars_values {
   MSM_VIDC_TRANSFER_RESERVED_1 = 0,
   MSM_VIDC_TRANSFER_BT709_5 = 1,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_TRANSFER_UNSPECIFIED = 2,
   MSM_VIDC_TRANSFER_RESERVED_2 = 3,
   MSM_VIDC_TRANSFER_BT_470_6_M = 4,
   MSM_VIDC_TRANSFER_BT_470_6_BG = 5,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_TRANSFER_601_6_625 = 6,
   MSM_VIDC_TRANSFER_601_6_525 = MSM_VIDC_TRANSFER_601_6_625,
   MSM_VIDC_TRANSFER_SMPTE_240M = 7,
   MSM_VIDC_TRANSFER_LINEAR = 8,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_TRANSFER_LOG_100_1 = 9,
   MSM_VIDC_TRANSFER_LOG_100_SQRT10_1 = 10,
   MSM_VIDC_TRANSFER_IEC_61966 = 11,
   MSM_VIDC_TRANSFER_BT_1361 = 12,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_TRANSFER_SRGB = 13,
   MSM_VIDC_TRANSFER_BT_2020_10 = 14,
   MSM_VIDC_TRANSFER_BT_2020_12 = 15,
+#define MSM_VIDC_TRANSFER_SMPTE_ST2084 MSM_VIDC_TRANSFER_SMPTE_ST2084
+  MSM_VIDC_TRANSFER_SMPTE_ST2084 = 16,
+#define MSM_VIDC_TRANSFER_SMPTE_ST428_1 MSM_VIDC_TRANSFER_SMPTE_ST428_1
+  MSM_VIDC_TRANSFER_SMPTE_ST428_1 = 17,
+#define MSM_VIDC_TRANSFER_HLG MSM_VIDC_TRANSFER_HLG
+  MSM_VIDC_TRANSFER_HLG = 18,
 };
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 enum msm_vidc_pixel_depth {
   MSM_VIDC_BIT_DEPTH_8,
   MSM_VIDC_BIT_DEPTH_10,
   MSM_VIDC_BIT_DEPTH_UNSUPPORTED = 0XFFFFFFFF,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 };
 enum msm_vidc_video_format {
   MSM_VIDC_COMPONENT,
   MSM_VIDC_PAL,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_NTSC,
   MSM_VIDC_SECAM,
   MSM_VIDC_MAC,
   MSM_VIDC_UNSPECIFIED_FORMAT,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_RESERVED_1_FORMAT,
   MSM_VIDC_RESERVED_2_FORMAT,
 };
 enum msm_vidc_color_desc_flag {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
   MSM_VIDC_COLOR_DESC_NOT_PRESENT,
   MSM_VIDC_COLOR_DESC_PRESENT,
 };
 #define MSM_VIDC_PIC_STRUCT_MAYBE_INTERLACED 0x0
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define MSM_VIDC_PIC_STRUCT_PROGRESSIVE 0x1
 #endif
-
diff --git a/original-kernel-headers/media/msm_vidc.h b/original-kernel-headers/media/msm_vidc.h
index e9370cb..95b6bab 100644
--- a/original-kernel-headers/media/msm_vidc.h
+++ b/original-kernel-headers/media/msm_vidc.h
@@ -345,6 +345,15 @@
 	MSM_VIDC_TRANSFER_SRGB = 13,
 	MSM_VIDC_TRANSFER_BT_2020_10 = 14,
 	MSM_VIDC_TRANSFER_BT_2020_12 = 15,
+#define MSM_VIDC_TRANSFER_SMPTE_ST2084 \
+	MSM_VIDC_TRANSFER_SMPTE_ST2084
+	MSM_VIDC_TRANSFER_SMPTE_ST2084 = 16,
+#define MSM_VIDC_TRANSFER_SMPTE_ST428_1 \
+	MSM_VIDC_TRANSFER_SMPTE_ST428_1
+	MSM_VIDC_TRANSFER_SMPTE_ST428_1 = 17,
+#define MSM_VIDC_TRANSFER_HLG \
+	MSM_VIDC_TRANSFER_HLG
+	MSM_VIDC_TRANSFER_HLG = 18,
 };
 
 enum msm_vidc_pixel_depth {