diff options
| author | Yaroslav Furman <yaro330@gmail.com> | 2019-01-09 12:53:45 +0300 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2022-07-27 19:23:19 +0200 |
| commit | 357dba0b0bb78d513b20fa0cf960f18fbc5dbdae (patch) | |
| tree | 1eae858b493dddfdfb040e093c500e5bfabcd159 /include/uapi | |
| parent | c3c7e8e07875dece75d0403bf340c9fd72fac391 (diff) | |
camera: ispif: fix wrong payload size error
Userspace expects msm_ispif_param_data_ext to have only 3
entries in it.
Squash of following commits:
commit e3a409b5e55f17a982c879db1a4ba23d8ed87cb4 (HEAD -> 4.4-eas-1.4)
Author: Yaroslav Furman <yaro330@gmail.com>
Date: Wed Jan 9 12:47:38 2019 +0300
Revert "msm: camera: ispif: adds 3D support"
This reverts commit cea9ac19b93db10dd5d40367d6b09d46f6dd8c3a.
commit 388522121977c93c1ec4f65c23740040a39c07ba
Author: Yaroslav Furman <yaro330@gmail.com>
Date: Wed Jan 9 12:46:56 2019 +0300
Revert "msm: camera: ispif: extend interface with line width"
This reverts commit cb9a11cd759f1d3348b0f3deb296eb415619d06f.
Signed-off-by: Yaroslav Furman <yaro330@gmail.com>
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Change-Id: Ib42061ad37fde64cec8c3ce17bb7947c51d055bd
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/media/msmb_ispif.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/include/uapi/media/msmb_ispif.h b/include/uapi/media/msmb_ispif.h index d532037427cc..3720056aa28d 100644 --- a/include/uapi/media/msmb_ispif.h +++ b/include/uapi/media/msmb_ispif.h @@ -36,6 +36,7 @@ enum msm_ispif_intftype { #define RDI1_MASK (1 << RDI1) #define RDI2_MASK (1 << RDI2) + enum msm_ispif_vc { VC0, VC1, @@ -101,18 +102,10 @@ struct msm_ispif_params_entry { uint16_t crop_end_pixel; }; -struct msm_ispif_right_param_entry { - enum msm_ispif_cid cids[MAX_CID_CH_PARAM_ENTRY]; - enum msm_ispif_csid csid; -}; - struct msm_ispif_param_data_ext { uint32_t num; struct msm_ispif_params_entry entries[MAX_PARAM_ENTRIES]; struct msm_ispif_pack_cfg pack_cfg[CID_MAX]; - struct msm_ispif_right_param_entry right_entries[MAX_PARAM_ENTRIES]; - uint32_t stereo_enable; - uint16_t line_width[VFE_MAX]; }; struct msm_ispif_param_data { @@ -144,7 +137,6 @@ enum ispif_cfg_type_t { ISPIF_ENABLE_REG_DUMP, ISPIF_SET_VFE_INFO, ISPIF_CFG2, - ISPIF_CFG_STEREO, }; struct ispif_cfg_data { @@ -165,10 +157,6 @@ struct ispif_cfg_data_ext { #define ISPIF_RDI_PACK_MODE_SUPPORT 1 -#define ISPIF_3D_SUPPORT 1 - -#define ISPIF_LINE_WIDTH_SUPPORT 1 - #define VIDIOC_MSM_ISPIF_CFG \ _IOWR('V', BASE_VIDIOC_PRIVATE, struct ispif_cfg_data) |