diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-01 03:19:07 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-12-01 03:19:07 -0700 |
| commit | d142a8d4f214b8390244d6424142dae35f3e4888 (patch) | |
| tree | bfec2401f07ca8e23aeba7034616f74f6cbdb6d0 /include/uapi | |
| parent | fe5ce2a6bc4fd8b58f74731ca2d13452ee776d43 (diff) | |
| parent | a27b2f17890884a05b18ae69c7eae079cdde4b16 (diff) | |
Promotion of kernel.lnx.4.4-161201.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1082413 Id6e648ecffd07de1fdafb6fc6187dc14e3e6e36e ARM: dts: msm: Add property to support multiple sensor
1074037 Ib29962ebc7427391d7c0e355fa46156d2a8d15e5 ARM: dts: msm: Add qseecom device node for msmfalcon
1086833 I237f60dca3e3dbad4e6188bf047cf7ec5163d159 msm: camera: sensor: Validate i2c_frq_mode in msm_cci_ge
1093792 Id76ebe4a2591664d44d8003730f70defcb2899bc ARM: dts: msm: add demo battery profile to msm8998 MTP
1090126 I3e8300f15757739714579055985e3fff1a4d8f86 ARM: dts: msm: Add msm-core device for msmfalcon
1094487 I92ed864aedfdd38c8670e08fb35a6545e8abb142 ARM: dts: msm: Add actuator and flash src for msm8998 qr
1032036 1086292 I49995875338cd2a3b57e88753cfda1bfa97910dd msm: mdss: Add HFP_CALC_CLK way to switch frame rate
518731 I9002f84b219e8b06ae0672d87c2d999e728a75aa msm: cpp: Fix for buffer overflow in cpp.
1086292 Icce8823f80e586bc4827d8db18dceb2fb866c2f9 msm: mdss: Fix null pointer reference during debug init
1086292 Ica77c16f3cf4b69f46c9003bb299c6413e199468 msm: mdss: Access DSI registers before turning off clock
1091727 Ib4d1328efe6e1df02e39502d38bb5662f9c4164c msm: camera: isp: Change declaration for VFE clock
1094349 I6b5aea46f1769021b39ba6e135bef780719a92e7 msm: kgsl: Update ringbuffer timer when preemption compl
1093792 I57d33cadbe26d5298ef7149a004d14102d62f365 ARM: dts: msm: add a demo battery profile for pmi8998 FG
1089373 Ie59a748d016211d5ddbab2593ec310a313690f9e ARM: dts: msm: Camera configuration for msmfalcon interp
1091754 I2b004c149b90ad03acf41d73e825976507a9a274 msm: isp: Add support to multipass offline ISP
1088050 Iff482f726d106e99a4006f7077a171da3c7ca9c3 msm: crypto: set CLR_CNTXT bit for crypto operations
1086292 I43500c07a318da9e2624a1631134228ad45e1cc7 msm: mdss: change error return value for lineptr sysfs e
Change-Id: I552b0454c60f61528a07b9902313d1888c3b6ae7
CRs-Fixed: 1094487, 1088050, 1089373, 1094349, 1074037, 1082413, 518731, 1032036, 1091754, 1090126, 1086833, 1091727, 1093792, 1086292
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/media/msmb_isp.h | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/include/uapi/media/msmb_isp.h b/include/uapi/media/msmb_isp.h index cdb85170919a..e4d41d4072c5 100644 --- a/include/uapi/media/msmb_isp.h +++ b/include/uapi/media/msmb_isp.h @@ -261,6 +261,26 @@ struct msm_vfe_fetch_eng_start { uint32_t frame_id; }; +enum msm_vfe_fetch_eng_pass { + OFFLINE_FIRST_PASS, + OFFLINE_SECOND_PASS, + OFFLINE_MAX_PASS, +}; + +struct msm_vfe_fetch_eng_multi_pass_start { + uint32_t session_id; + uint32_t stream_id; + uint32_t buf_idx; + uint8_t offline_mode; + uint32_t fd; + uint32_t buf_addr; + uint32_t frame_id; + uint32_t output_buf_idx; + uint32_t input_buf_offset; + enum msm_vfe_fetch_eng_pass offline_pass; + uint32_t output_stream_id; +}; + struct msm_vfe_axi_plane_cfg { uint32_t output_width; /*Include padding*/ uint32_t output_height; @@ -328,6 +348,7 @@ enum msm_vfe_axi_stream_update_type { UPDATE_STREAM_REMOVE_BUFQ, UPDATE_STREAM_SW_FRAME_DROP, UPDATE_STREAM_REQUEST_FRAMES_VER2, + UPDATE_STREAM_OFFLINE_AXI_CONFIG, }; #define UPDATE_STREAM_REQUEST_FRAMES_VER2 UPDATE_STREAM_REQUEST_FRAMES_VER2 @@ -853,6 +874,8 @@ enum msm_isp_ioctl_cmd_code { MSM_ISP_SET_DUAL_HW_MASTER_SLAVE, MSM_ISP_MAP_BUF_START_FE, MSM_ISP_UNMAP_BUF, + MSM_ISP_FETCH_ENG_MULTI_PASS_START, + MSM_ISP_MAP_BUF_START_MULTI_PASS_FE, }; #define VIDIOC_MSM_VFE_REG_CFG \ @@ -958,4 +981,11 @@ enum msm_isp_ioctl_cmd_code { #define VIDIOC_MSM_ISP_AHB_CLK_CFG \ _IOWR('V', BASE_VIDIOC_PRIVATE+25, struct msm_isp_ahb_clk_cfg) +#define VIDIOC_MSM_ISP_FETCH_ENG_MULTI_PASS_START \ + _IOWR('V', MSM_ISP_FETCH_ENG_MULTI_PASS_START, \ + struct msm_vfe_fetch_eng_multi_pass_start) + +#define VIDIOC_MSM_ISP_MAP_BUF_START_MULTI_PASS_FE \ + _IOWR('V', MSM_ISP_MAP_BUF_START_MULTI_PASS_FE, \ + struct msm_vfe_fetch_eng_multi_pass_start) #endif /* __MSMB_ISP__ */ |