diff options
| author | Naseer Ahmed <naseer@codeaurora.org> | 2013-03-25 13:45:31 -0400 |
|---|---|---|
| committer | Erik Gilling <konkers@android.com> | 2013-03-25 14:31:02 -0700 |
| commit | 882a818673cabdb635f3d8aad88839b58109a2e6 (patch) | |
| tree | b9ab68d385bd3b57938eda5dddf93d3a58837719 | |
| parent | 7426d34809c10bbb67cc551f9c1d8873fb49577d (diff) | |
| download | msm8x74-882a818673cabdb635f3d8aad88839b58109a2e6.tar.gz | |
Update msm_mdp.h
Change-Id: Icd59443ce4639dab88f40d6188353033d05d72b5
| -rw-r--r-- | kernel-headers/linux/msm_mdp.h | 17 | ||||
| -rw-r--r-- | original-kernel-headers/linux/msm_mdp.h | 9 |
2 files changed, 22 insertions, 4 deletions
diff --git a/kernel-headers/linux/msm_mdp.h b/kernel-headers/linux/msm_mdp.h index 239c2d8..76866f0 100644 --- a/kernel-headers/linux/msm_mdp.h +++ b/kernel-headers/linux/msm_mdp.h @@ -591,27 +591,37 @@ enum { metadata_op_vic, metadata_op_wb_format, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + metadata_op_get_caps, metadata_op_max }; struct mdp_blend_cfg { - uint32_t is_premultiplied; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + uint32_t is_premultiplied; }; struct mdp_mixer_cfg { uint32_t writeback_format; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint32_t alpha; +}; +struct mdss_hw_caps { + uint32_t mdp_rev; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + uint8_t rgb_pipes; + uint8_t vig_pipes; + uint8_t dma_pipes; }; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct msmfb_metadata { uint32_t op; uint32_t flags; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ union { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct mdp_blend_cfg blend_cfg; struct mdp_mixer_cfg mixer_cfg; uint32_t panel_frame_rate; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint32_t video_info_code; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + struct mdss_hw_caps caps; } data; }; #define MDP_MAX_FENCE_FD 10 @@ -663,4 +673,3 @@ enum { /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; #endif - diff --git a/original-kernel-headers/linux/msm_mdp.h b/original-kernel-headers/linux/msm_mdp.h index 45bc0ea..7e347ee 100644 --- a/original-kernel-headers/linux/msm_mdp.h +++ b/original-kernel-headers/linux/msm_mdp.h @@ -595,6 +595,7 @@ enum { metadata_op_frame_rate, metadata_op_vic, metadata_op_wb_format, + metadata_op_get_caps, metadata_op_max }; @@ -607,6 +608,13 @@ struct mdp_mixer_cfg { uint32_t alpha; }; +struct mdss_hw_caps { + uint32_t mdp_rev; + uint8_t rgb_pipes; + uint8_t vig_pipes; + uint8_t dma_pipes; +}; + struct msmfb_metadata { uint32_t op; uint32_t flags; @@ -615,6 +623,7 @@ struct msmfb_metadata { struct mdp_mixer_cfg mixer_cfg; uint32_t panel_frame_rate; uint32_t video_info_code; + struct mdss_hw_caps caps; } data; }; |