evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: mdss: Add support for secure camera"

Browse source
This commit is contained in:
Linux Build Service Account 2016-11-08 11:18:40 -08:00 • committed by Gerrit - the friendly Code Review server
commit a273d731af
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/uapi/linux/msm_mdp_ext.h
View file

@ -96,6 +96,10 @@ LAYER FLAG CONFIGURATION
*/ */
#define MDP_LAYER_MULTIRECT_PARALLEL_MODE 0x2000 #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 DESTINATION SCALER FLAG CONFIGURATION
**********************************************************************/ **********************************************************************/

6
include/uapi/media/msm_sde_rotator.h
View file

@ -86,4 +86,10 @@ struct msm_sde_rotator_fence {
/* SDE Rotator private control ID's */ /* SDE Rotator private control ID's */
#define V4L2_CID_SDE_ROTATOR_SECURE (V4L2_CID_USER_BASE + 0x1000) #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__ */ #endif /* __UAPI_MSM_SDE_ROTATOR_H__ */