summaryrefslogtreecommitdiff
path: root/original-kernel-headers
diff options
context:
space:
mode:
authorVineeta Srivastava <vsrivastava@google.com>2015-05-29 14:46:01 -0700
committerVineeta Srivastava <vsrivastava@google.com>2015-05-29 14:46:01 -0700
commitfd02183011fb785027c32262a1f0f45d749d1114 (patch)
treedc8ffb11d7a960ff101c101f6faa8deffcc4cd39 /original-kernel-headers
parent377a63e191a90aab8aad025c7a2e0231f5d6ecf2 (diff)
downloadmsm8994-fd02183011fb785027c32262a1f0f45d749d1114.tar.gz
msm8994: update kernel header
update kernel header of msm_mdp.h, v4l2-controls.h and msmb_isp.h Change-Id: I92e1d691b74b1eae7ba5d0115731e85fffac919c
Diffstat (limited to 'original-kernel-headers')
-rw-r--r--original-kernel-headers/linux/msm_mdp.h1
-rw-r--r--original-kernel-headers/linux/v4l2-controls.h11
-rw-r--r--original-kernel-headers/media/msmb_isp.h50
3 files changed, 47 insertions, 15 deletions
diff --git a/original-kernel-headers/linux/msm_mdp.h b/original-kernel-headers/linux/msm_mdp.h
index f934b80..8ba94b7 100644
--- a/original-kernel-headers/linux/msm_mdp.h
+++ b/original-kernel-headers/linux/msm_mdp.h
@@ -116,6 +116,7 @@ enum {
NOTIFY_TYPE_SUSPEND,
NOTIFY_TYPE_UPDATE,
NOTIFY_TYPE_BL_UPDATE,
+ NOTIFY_TYPE_BL_AD_ATTEN_UPDATE,
};
enum {
diff --git a/original-kernel-headers/linux/v4l2-controls.h b/original-kernel-headers/linux/v4l2-controls.h
index 216abb7..4f944f5 100644
--- a/original-kernel-headers/linux/v4l2-controls.h
+++ b/original-kernel-headers/linux/v4l2-controls.h
@@ -992,6 +992,17 @@ enum v4l2_mpeg_vidc_video_perf_mode {
#define V4L2_CID_MPEG_VIDC_VIDEO_HYBRID_HIERP_MODE \
(V4L2_CID_MPEG_MSM_VIDC_BASE + 72)
+#define V4L2_CID_MPEG_VIDC_VIDEO_PRIORITY \
+ (V4L2_CID_MPEG_MSM_VIDC_BASE + 73)
+
+enum v4l2_mpeg_vidc_video_priority {
+ V4L2_MPEG_VIDC_VIDEO_PRIORITY_REALTIME_ENABLE = 0,
+ V4L2_MPEG_VIDC_VIDEO_PRIORITY_REALTIME_DISABLE = 1,
+};
+
+#define V4L2_CID_MPEG_VIDC_VIDEO_OPERATING_RATE \
+ (V4L2_CID_MPEG_MSM_VIDC_BASE + 74)
+
/* Camera class control IDs */
#define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA | 0x900)
diff --git a/original-kernel-headers/media/msmb_isp.h b/original-kernel-headers/media/msmb_isp.h
index 22a7645..97e792f 100644
--- a/original-kernel-headers/media/msmb_isp.h
+++ b/original-kernel-headers/media/msmb_isp.h
@@ -160,6 +160,8 @@ struct msm_vfe_camif_subsample_cfg {
uint32_t irq_subsample_period;
uint32_t irq_subsample_pattern;
uint32_t sof_counter_step;
+ uint32_t pixel_skip;
+ uint32_t line_skip;
};
/*
@@ -322,6 +324,7 @@ struct msm_vfe_axi_stream_cfg_update_info {
struct msm_vfe_axi_halt_cmd {
uint32_t stop_camif;
uint32_t overflow_detected;
+ uint32_t blocking_halt;
};
struct msm_vfe_axi_reset_cmd {
@@ -474,19 +477,22 @@ struct msm_vfe_axi_src_state {
};
enum msm_isp_event_idx {
- ISP_REG_UPDATE = 0,
- ISP_EPOCH_0 = 1,
- ISP_EPOCH_1 = 2,
- ISP_START_ACK = 3,
- ISP_STOP_ACK = 4,
- ISP_IRQ_VIOLATION = 5,
- ISP_WM_BUS_OVERFLOW = 6,
- ISP_STATS_OVERFLOW = 7,
- ISP_CAMIF_ERROR = 8,
- ISP_BUF_DONE = 9,
- ISP_FE_RD_DONE = 10,
- ISP_IOMMU_P_FAULT = 11,
- ISP_EVENT_MAX = 12
+ ISP_REG_UPDATE = 0,
+ ISP_EPOCH_0 = 1,
+ ISP_EPOCH_1 = 2,
+ ISP_START_ACK = 3,
+ ISP_STOP_ACK = 4,
+ ISP_IRQ_VIOLATION = 5,
+ ISP_WM_BUS_OVERFLOW = 6,
+ ISP_STATS_OVERFLOW = 7,
+ ISP_CAMIF_ERROR = 8,
+ ISP_BUF_DONE = 9,
+ ISP_FE_RD_DONE = 10,
+ ISP_IOMMU_P_FAULT = 11,
+ ISP_FRAME_ID_MISMATCH = 12,
+ ISP_GET_BUF_FAILED = 13,
+ ISP_STATS_FRAME_DROP = 14,
+ ISP_EVENT_MAX = 15
};
#define ISP_EVENT_OFFSET 8
@@ -538,7 +544,9 @@ struct msm_isp_stream_ack {
struct msm_isp_error_info {
/* 1 << msm_isp_event_idx */
- uint32_t error_mask;
+ uint16_t error_mask;
+ uint16_t stream_framedrop_mask;
+ uint32_t stats_framedrop_mask;
};
struct msm_isp_event_data {
@@ -548,7 +556,6 @@ struct msm_isp_event_data {
struct timeval timestamp;
/* Monotonic timestamp since bootup */
struct timeval mono_timestamp;
- enum msm_vfe_input_src input_intf;
uint32_t frame_id;
union {
struct msm_isp_stats_event stats;
@@ -557,6 +564,19 @@ struct msm_isp_event_data {
} u; /* union can have max 52 bytes */
};
+#ifdef CONFIG_COMPAT
+struct msm_isp_event_data32 {
+ struct compat_timeval timestamp;
+ struct compat_timeval mono_timestamp;
+ uint32_t frame_id;
+ union {
+ struct msm_isp_stats_event stats;
+ struct msm_isp_buf_event buf_done;
+ struct msm_isp_error_info error_info;
+ } u;
+};
+#endif
+
#define V4L2_PIX_FMT_QBGGR8 v4l2_fourcc('Q', 'B', 'G', '8')
#define V4L2_PIX_FMT_QGBRG8 v4l2_fourcc('Q', 'G', 'B', '8')
#define V4L2_PIX_FMT_QGRBG8 v4l2_fourcc('Q', 'G', 'R', '8')