diff options
Diffstat (limited to 'original-kernel-headers/linux/msm_mdp.h')
| -rw-r--r-- | original-kernel-headers/linux/msm_mdp.h | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/original-kernel-headers/linux/msm_mdp.h b/original-kernel-headers/linux/msm_mdp.h index 8f8e2a5..8eb3c4d 100644 --- a/original-kernel-headers/linux/msm_mdp.h +++ b/original-kernel-headers/linux/msm_mdp.h @@ -67,7 +67,6 @@ #define MSMFB_ASYNC_BLIT _IOW(MSMFB_IOCTL_MAGIC, 168, unsigned int) #define MSMFB_OVERLAY_PREPARE _IOWR(MSMFB_IOCTL_MAGIC, 169, \ struct mdp_overlay_list) -#define MSMFB_LPM_ENABLE _IOWR(MSMFB_IOCTL_MAGIC, 170, unsigned int) #define FB_TYPE_3D_PANEL 0x10101010 #define MDP_IMGTYPE2_START 0x10000 @@ -95,11 +94,8 @@ #define MDSS_MDP_HW_REV_102_1 MDSS_MDP_REV(1, 2, 1) /* 8974 v3.0 (Pro) */ #define MDSS_MDP_HW_REV_103 MDSS_MDP_REV(1, 3, 0) /* 8084 v1.0 */ #define MDSS_MDP_HW_REV_103_1 MDSS_MDP_REV(1, 3, 1) /* 8084 v1.1 */ -#define MDSS_MDP_HW_REV_105 MDSS_MDP_REV(1, 5, 0) /* 8994 v1.0 */ -#define MDSS_MDP_HW_REV_106 MDSS_MDP_REV(1, 6, 0) /* 8916 v1.0 */ -#define MDSS_MDP_HW_REV_107 MDSS_MDP_REV(1, 7, 0) -#define MDSS_MDP_HW_REV_108 MDSS_MDP_REV(1, 8, 0) /* 8939 v1.0 */ #define MDSS_MDP_HW_REV_200 MDSS_MDP_REV(2, 0, 0) /* 8092 v1.0 */ +#define MDSS_MDP_HW_REV_106 MDSS_MDP_REV(1, 6, 0) /* 8916 v1.0 */ enum { NOTIFY_UPDATE_START, @@ -111,7 +107,6 @@ enum { NOTIFY_TYPE_NO_UPDATE, NOTIFY_TYPE_SUSPEND, NOTIFY_TYPE_UPDATE, - NOTIFY_TYPE_BL_UPDATE, }; enum { @@ -550,25 +545,6 @@ struct mdp_scale_data { }; /** - * enum mdp_overlay_pipe_type - Different pipe type set by userspace - * - * @PIPE_TYPE_AUTO: Not specified, pipe will be selected according to flags. - * @PIPE_TYPE_VIG: VIG pipe. - * @PIPE_TYPE_RGB: RGB pipe. - * @PIPE_TYPE_DMA: DMA pipe. - * @PIPE_TYPE_CURSOR: CURSOR pipe. - * @PIPE_TYPE_MAX: Used to track maximum number of pipe type. - */ -enum mdp_overlay_pipe_type { - PIPE_TYPE_AUTO = 0, - PIPE_TYPE_VIG, - PIPE_TYPE_RGB, - PIPE_TYPE_DMA, - PIPE_TYPE_CURSOR, - PIPE_TYPE_MAX, -}; - -/** * struct mdp_overlay - overlay surface structure * @src: Source image information (width, height, format). * @src_rect: Source crop rectangle, portion of image that will be fetched. @@ -590,7 +566,6 @@ enum mdp_overlay_pipe_type { * The color should be in same format as the source image format. * @flags: This is used to customize operation of overlay. See MDP flags * for more information. - * @pipe_type: Used to specify the type of overlay pipe. * @user_data: DEPRECATED* Used to store user application specific information. * @bg_color: Solid color used to fill the overlay surface when no source * buffer is provided. @@ -628,7 +603,6 @@ struct mdp_overlay { uint32_t blend_op; uint32_t transp_mask; uint32_t flags; - uint32_t pipe_type; uint32_t id; uint8_t priority; uint32_t user_data[6]; @@ -1001,7 +975,6 @@ enum { metadata_op_wb_secure, metadata_op_get_caps, metadata_op_crc, - metadata_op_get_ion_fd, metadata_op_max }; @@ -1035,7 +1008,6 @@ struct msmfb_metadata { uint32_t video_info_code; struct mdss_hw_caps caps; uint8_t secure_en; - int fbmem_ionfd; } data; }; @@ -1064,8 +1036,7 @@ struct mdp_display_commit { uint32_t flags; uint32_t wait_for_finish; struct fb_var_screeninfo var; - struct mdp_rect l_roi; - struct mdp_rect r_roi; + struct mdp_rect roi; }; /** @@ -1099,7 +1070,7 @@ struct mdp_mixer_info { int z_order; }; -#define MAX_PIPE_PER_MIXER 7 +#define MAX_PIPE_PER_MIXER 4 struct msmfb_mixer_info_req { int mixer_num; |