diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-08 11:18:40 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-08 11:18:39 -0800 |
| commit | a273d731aff32612c67fbbf22238f62e5237dfbc (patch) | |
| tree | bf5fe4949f1419819e0aab8cdb6428a9e76ddc91 /include/uapi | |
| parent | cb5186819881878a9f64320a3a110e7490c57f2b (diff) | |
| parent | f7768d3345034fd29ebed5c5deb0a00b3756e98d (diff) | |
Merge "msm: mdss: Add support for secure camera"
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/msm_mdp_ext.h | 4 | ||||
| -rw-r--r-- | include/uapi/media/msm_sde_rotator.h | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/uapi/linux/msm_mdp_ext.h b/include/uapi/linux/msm_mdp_ext.h index d2077024769f..1a71e860ba48 100644 --- a/include/uapi/linux/msm_mdp_ext.h +++ b/include/uapi/linux/msm_mdp_ext.h @@ -96,6 +96,10 @@ LAYER FLAG CONFIGURATION */ #define MDP_LAYER_MULTIRECT_PARALLEL_MODE 0x2000 + +/* Flag indicates that layer is associated with secure camera session */ +#define MDP_LAYER_SECURE_CAMERA_SESSION 0x4000 + /********************************************************************** DESTINATION SCALER FLAG CONFIGURATION **********************************************************************/ diff --git a/include/uapi/media/msm_sde_rotator.h b/include/uapi/media/msm_sde_rotator.h index 4487edf0c854..12976e3f14d7 100644 --- a/include/uapi/media/msm_sde_rotator.h +++ b/include/uapi/media/msm_sde_rotator.h @@ -86,4 +86,10 @@ struct msm_sde_rotator_fence { /* SDE Rotator private control ID's */ #define V4L2_CID_SDE_ROTATOR_SECURE (V4L2_CID_USER_BASE + 0x1000) +/* + * This control Id indicates this context is associated with the + * secure camera + */ +#define V4L2_CID_SDE_ROTATOR_SECURE_CAMERA (V4L2_CID_USER_BASE + 0x2000) + #endif /* __UAPI_MSM_SDE_ROTATOR_H__ */ |