summaryrefslogtreecommitdiff
path: root/sdm845
diff options
context:
space:
mode:
authorAlexey Polyudov <apolyudov@google.com>2017-10-13 09:49:27 -0700
committerAlexey Polyudov <apolyudov@google.com>2017-10-13 09:49:27 -0700
commitcc8027cb3d00f3e6600f17815d3f3149e3e4584d (patch)
tree7794679f1be1a95c3cbee8b0ff8219ec2cde19a7 /sdm845
parent9e56e923841359a1a18fb531e0d02a78d4f29343 (diff)
downloadbonito-cc8027cb3d00f3e6600f17815d3f3149e3e4584d.tar.gz
Update kernel headers
Change-Id: I08892d179120e823a3daaf28d7aa11d4042368d0 Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Diffstat (limited to 'sdm845')
-rw-r--r--sdm845/kernel-headers/drm/msm_drm.h1
-rw-r--r--sdm845/kernel-headers/drm/sde_drm.h16
-rw-r--r--sdm845/kernel-headers/linux/v4l2-controls.h27
-rw-r--r--sdm845/original-kernel-headers/drm/msm_drm.h1
-rw-r--r--sdm845/original-kernel-headers/drm/sde_drm.h40
-rw-r--r--sdm845/original-kernel-headers/linux/v4l2-controls.h32
-rw-r--r--sdm845/original-kernel-headers/sound/audio_effects.h13
-rw-r--r--sdm845/original-kernel-headers/sound/devdep_params.h13
-rw-r--r--sdm845/original-kernel-headers/sound/msmcal-hwdep.h12
9 files changed, 116 insertions, 39 deletions
diff --git a/sdm845/kernel-headers/drm/msm_drm.h b/sdm845/kernel-headers/drm/msm_drm.h
index e5155ba1..a7e7389f 100644
--- a/sdm845/kernel-headers/drm/msm_drm.h
+++ b/sdm845/kernel-headers/drm/msm_drm.h
@@ -169,6 +169,7 @@ struct drm_msm_event_resp {
#define DRM_EVENT_CRTC_POWER 0x80000002
#define DRM_EVENT_SYS_BACKLIGHT 0x80000003
#define DRM_EVENT_SDE_POWER 0x80000004
+#define DRM_EVENT_IDLE_NOTIFY 0x80000005
#define DRM_IOCTL_MSM_GET_PARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GET_PARAM, struct drm_msm_param)
#define DRM_IOCTL_MSM_GEM_NEW DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GEM_NEW, struct drm_msm_gem_new)
#define DRM_IOCTL_MSM_GEM_INFO DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GEM_INFO, struct drm_msm_gem_info)
diff --git a/sdm845/kernel-headers/drm/sde_drm.h b/sdm845/kernel-headers/drm/sde_drm.h
index bb63fb1e..ea75b860 100644
--- a/sdm845/kernel-headers/drm/sde_drm.h
+++ b/sdm845/kernel-headers/drm/sde_drm.h
@@ -113,6 +113,22 @@ struct sde_drm_scaler_v2 {
uint32_t uv_sep_lut_idx;
struct sde_drm_de_v1 de;
};
+#define SDE_MAX_DS_COUNT 2
+#define SDE_DRM_DESTSCALER_ENABLE 0x1
+#define SDE_DRM_DESTSCALER_SCALE_UPDATE 0x2
+#define SDE_DRM_DESTSCALER_ENHANCER_UPDATE 0x4
+#define SDE_DRM_DESTSCALER_PU_ENABLE 0x8
+struct sde_drm_dest_scaler_cfg {
+ uint32_t flags;
+ uint32_t index;
+ uint32_t lm_width;
+ uint32_t lm_height;
+ uint64_t scaler_cfg;
+};
+struct sde_drm_dest_scaler_data {
+ uint32_t num_dest_scaler;
+ struct sde_drm_dest_scaler_cfg ds_cfg[SDE_MAX_DS_COUNT];
+};
#define SDE_CSC_MATRIX_COEFF_SIZE 9
#define SDE_CSC_CLAMP_SIZE 6
#define SDE_CSC_BIAS_SIZE 3
diff --git a/sdm845/kernel-headers/linux/v4l2-controls.h b/sdm845/kernel-headers/linux/v4l2-controls.h
index 19d28572..923b55ee 100644
--- a/sdm845/kernel-headers/linux/v4l2-controls.h
+++ b/sdm845/kernel-headers/linux/v4l2-controls.h
@@ -823,6 +823,26 @@ enum v4l2_cid_mpeg_vidc_video_full_range {
#define V4L2_CID_MPEG_VIDC_VIDEO_MATRIX_COEFFS (V4L2_CID_MPEG_MSM_VIDC_BASE + 63)
#define V4L2_CID_MPEG_VIDC_VIDEO_IFRAME_SIZE_TYPE (V4L2_CID_MPEG_MSM_VIDC_BASE + 64)
#define V4L2_CID_MPEG_VIDC_VIDEO_LAYER_ID (V4L2_CID_MPEG_MSM_VIDC_BASE + 65)
+#define V4L2_CID_MPEG_VIDC_VIDEO_VP9_PROFILE (V4L2_CID_MPEG_MSM_VIDC_BASE + 66)
+enum v4l2_mpeg_vidc_video_vp9_profile {
+ V4L2_MPEG_VIDC_VIDEO_VP9_PROFILE_UNUSED = 0,
+ V4L2_MPEG_VIDC_VIDEO_VP9_PROFILE_P0 = 1,
+ V4L2_MPEG_VIDC_VIDEO_VP9_PROFILE_P2_10 = 2,
+};
+#define V4L2_CID_MPEG_VIDC_VIDEO_VP9_LEVEL (V4L2_CID_MPEG_MSM_VIDC_BASE + 67)
+enum v4l2_mpeg_vidc_video_vp9_level {
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_UNUSED = 0,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_1 = 1,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_11 = 2,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_2 = 3,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_21 = 4,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_3 = 5,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_31 = 6,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_4 = 7,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_41 = 8,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_5 = 9,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_51 = 10,
+};
#define V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP (V4L2_CID_MPEG_MSM_VIDC_BASE + 99)
#define V4L2_CID_MPEG_VIDC_VIDEO_P_FRAME_QP (V4L2_CID_MPEG_MSM_VIDC_BASE + 100)
#define V4L2_CID_MPEG_VIDC_VIDEO_B_FRAME_QP (V4L2_CID_MPEG_MSM_VIDC_BASE + 101)
@@ -854,6 +874,13 @@ enum v4l2_mpeg_vidc_video_tme_level {
};
#define V4L2_CID_MPEG_VIDC_VIDEO_TME_PAYLOAD_VERSION (V4L2_CID_MPEG_MSM_VIDC_BASE + 113)
#define V4L2_CID_MPEG_VIDC_VIDEO_VPE_CSC_CUSTOM_MATRIX (V4L2_CID_MPEG_MSM_VIDC_BASE + 114)
+#define V4L2_CID_MPEG_VIDC_VIDEO_FLIP (V4L2_CID_MPEG_MSM_VIDC_BASE + 115)
+enum v4l2_mpeg_vidc_video_flip {
+ V4L2_CID_MPEG_VIDC_VIDEO_FLIP_NONE = 0,
+ V4L2_CID_MPEG_VIDC_VIDEO_FLIP_HORI = 1,
+ V4L2_CID_MPEG_VIDC_VIDEO_FLIP_VERT = 2,
+ V4L2_CID_MPEG_VIDC_VIDEO_FLIP_BOTH = 3,
+};
#define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA | 0x900)
#define V4L2_CID_CAMERA_CLASS (V4L2_CTRL_CLASS_CAMERA | 1)
#define V4L2_CID_EXPOSURE_AUTO (V4L2_CID_CAMERA_CLASS_BASE + 1)
diff --git a/sdm845/original-kernel-headers/drm/msm_drm.h b/sdm845/original-kernel-headers/drm/msm_drm.h
index f9b4693b..2ac9df0d 100644
--- a/sdm845/original-kernel-headers/drm/msm_drm.h
+++ b/sdm845/original-kernel-headers/drm/msm_drm.h
@@ -323,6 +323,7 @@ struct drm_msm_event_resp {
#define DRM_EVENT_CRTC_POWER 0x80000002
#define DRM_EVENT_SYS_BACKLIGHT 0x80000003
#define DRM_EVENT_SDE_POWER 0x80000004
+#define DRM_EVENT_IDLE_NOTIFY 0x80000005
#define DRM_IOCTL_MSM_GET_PARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GET_PARAM, struct drm_msm_param)
#define DRM_IOCTL_MSM_GEM_NEW DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GEM_NEW, struct drm_msm_gem_new)
diff --git a/sdm845/original-kernel-headers/drm/sde_drm.h b/sdm845/original-kernel-headers/drm/sde_drm.h
index 439a9256..1a43659a 100644
--- a/sdm845/original-kernel-headers/drm/sde_drm.h
+++ b/sdm845/original-kernel-headers/drm/sde_drm.h
@@ -67,7 +67,7 @@
#define SDE_DRM_BITMASK_COUNT 64
/**
- * Framebuffer modes for "fb_translation_mode" PLANE property
+ * Framebuffer modes for "fb_translation_mode" PLANE and CONNECTOR property
*
* @SDE_DRM_FB_NON_SEC: IOMMU configuration for this framebuffer mode
* is non-secure domain and requires
@@ -295,6 +295,44 @@ struct sde_drm_scaler_v2 {
struct sde_drm_de_v1 de;
};
+/* Number of dest scalers supported */
+#define SDE_MAX_DS_COUNT 2
+
+/*
+ * Destination scaler flag config
+ */
+#define SDE_DRM_DESTSCALER_ENABLE 0x1
+#define SDE_DRM_DESTSCALER_SCALE_UPDATE 0x2
+#define SDE_DRM_DESTSCALER_ENHANCER_UPDATE 0x4
+#define SDE_DRM_DESTSCALER_PU_ENABLE 0x8
+
+/**
+ * struct sde_drm_dest_scaler_cfg - destination scaler config structure
+ * @flags: Flag to switch between mode for destination scaler
+ * refer to destination scaler flag config
+ * @index: Destination scaler selection index
+ * @lm_width: Layer mixer width configuration
+ * @lm_height: Layer mixer height configuration
+ * @scaler_cfg: The scaling parameters for all the mode except disable
+ * Userspace pointer to struct sde_drm_scaler_v2
+ */
+struct sde_drm_dest_scaler_cfg {
+ uint32_t flags;
+ uint32_t index;
+ uint32_t lm_width;
+ uint32_t lm_height;
+ uint64_t scaler_cfg;
+};
+
+/**
+ * struct sde_drm_dest_scaler_data - destination scaler data struct
+ * @num_dest_scaler: Number of dest scalers to be configured
+ * @ds_cfg: Destination scaler block configuration
+ */
+struct sde_drm_dest_scaler_data {
+ uint32_t num_dest_scaler;
+ struct sde_drm_dest_scaler_cfg ds_cfg[SDE_MAX_DS_COUNT];
+};
/*
* Define constants for struct sde_drm_csc
diff --git a/sdm845/original-kernel-headers/linux/v4l2-controls.h b/sdm845/original-kernel-headers/linux/v4l2-controls.h
index dcff75be..d7505686 100644
--- a/sdm845/original-kernel-headers/linux/v4l2-controls.h
+++ b/sdm845/original-kernel-headers/linux/v4l2-controls.h
@@ -1046,6 +1046,30 @@ enum v4l2_cid_mpeg_vidc_video_full_range {
#define V4L2_CID_MPEG_VIDC_VIDEO_LAYER_ID \
(V4L2_CID_MPEG_MSM_VIDC_BASE + 65)
+#define V4L2_CID_MPEG_VIDC_VIDEO_VP9_PROFILE \
+ (V4L2_CID_MPEG_MSM_VIDC_BASE + 66)
+enum v4l2_mpeg_vidc_video_vp9_profile {
+ V4L2_MPEG_VIDC_VIDEO_VP9_PROFILE_UNUSED = 0,
+ V4L2_MPEG_VIDC_VIDEO_VP9_PROFILE_P0 = 1,
+ V4L2_MPEG_VIDC_VIDEO_VP9_PROFILE_P2_10 = 2,
+};
+
+#define V4L2_CID_MPEG_VIDC_VIDEO_VP9_LEVEL \
+ (V4L2_CID_MPEG_MSM_VIDC_BASE + 67)
+enum v4l2_mpeg_vidc_video_vp9_level {
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_UNUSED = 0,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_1 = 1,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_11 = 2,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_2 = 3,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_21 = 4,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_3 = 5,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_31 = 6,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_4 = 7,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_41 = 8,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_5 = 9,
+ V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_51 = 10,
+};
+
#define V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP \
(V4L2_CID_MPEG_MSM_VIDC_BASE + 99)
#define V4L2_CID_MPEG_VIDC_VIDEO_P_FRAME_QP \
@@ -1102,6 +1126,14 @@ enum v4l2_mpeg_vidc_video_tme_level {
#define V4L2_CID_MPEG_VIDC_VIDEO_VPE_CSC_CUSTOM_MATRIX \
(V4L2_CID_MPEG_MSM_VIDC_BASE + 114)
+#define V4L2_CID_MPEG_VIDC_VIDEO_FLIP (V4L2_CID_MPEG_MSM_VIDC_BASE + 115)
+enum v4l2_mpeg_vidc_video_flip {
+ V4L2_CID_MPEG_VIDC_VIDEO_FLIP_NONE = 0,
+ V4L2_CID_MPEG_VIDC_VIDEO_FLIP_HORI = 1,
+ V4L2_CID_MPEG_VIDC_VIDEO_FLIP_VERT = 2,
+ V4L2_CID_MPEG_VIDC_VIDEO_FLIP_BOTH = 3,
+};
+
/* Camera class control IDs */
#define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA | 0x900)
diff --git a/sdm845/original-kernel-headers/sound/audio_effects.h b/sdm845/original-kernel-headers/sound/audio_effects.h
index 7b988e89..0ac887cd 100644
--- a/sdm845/original-kernel-headers/sound/audio_effects.h
+++ b/sdm845/original-kernel-headers/sound/audio_effects.h
@@ -1,16 +1,3 @@
-/*
- * Copyright (c) 2013-2015, 2017 The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
#ifndef _AUDIO_EFFECTS_H
#define _AUDIO_EFFECTS_H
diff --git a/sdm845/original-kernel-headers/sound/devdep_params.h b/sdm845/original-kernel-headers/sound/devdep_params.h
index 9868713b..b4a185f7 100644
--- a/sdm845/original-kernel-headers/sound/devdep_params.h
+++ b/sdm845/original-kernel-headers/sound/devdep_params.h
@@ -1,16 +1,3 @@
-/*
- * Copyright (c) 2013-2015,2017, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
#ifndef _DEV_DEP_H
#define _DEV_DEP_H
diff --git a/sdm845/original-kernel-headers/sound/msmcal-hwdep.h b/sdm845/original-kernel-headers/sound/msmcal-hwdep.h
index e8fc185d..abb66106 100644
--- a/sdm845/original-kernel-headers/sound/msmcal-hwdep.h
+++ b/sdm845/original-kernel-headers/sound/msmcal-hwdep.h
@@ -1,15 +1,3 @@
-/*
- * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
#ifndef _CALIB_HWDEP_H
#define _CALIB_HWDEP_H