diff options
| author | Patrick Tjin <pattjin@google.com> | 2013-09-16 21:44:06 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2013-09-17 15:35:19 -0700 |
| commit | 014f74fb13f0db7b5efc63291b343e9179b5087b (patch) | |
| tree | 884277bd08e96eead520eca2b8fabe2da92c4470 | |
| parent | afaab06f50c80998870c511ac91c899f1e3d6306 (diff) | |
| download | msm8x74-014f74fb13f0db7b5efc63291b343e9179b5087b.tar.gz | |
Revert "mdp: Update header for retire fence"android-4.4_r0.7
This reverts commit f381cb18448e109379fcf6af8f887776de7c3343.
| -rw-r--r-- | kernel-headers/linux/msm_mdp.h | 29 | ||||
| -rw-r--r-- | original-kernel-headers/linux/msm_mdp.h | 9 |
2 files changed, 26 insertions, 12 deletions
diff --git a/kernel-headers/linux/msm_mdp.h b/kernel-headers/linux/msm_mdp.h index 205df7b..c0aef34 100644 --- a/kernel-headers/linux/msm_mdp.h +++ b/kernel-headers/linux/msm_mdp.h @@ -836,59 +836,66 @@ struct mdp_buf_sync { int *acq_fen_fd; int *rel_fen_fd; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ - int *retire_fen_fd; }; struct mdp_async_blit_req_list { struct mdp_buf_sync sync; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint32_t count; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct mdp_blit_req req[]; }; #define MDP_DISPLAY_COMMIT_OVERLAY 1 +struct mdp_buf_fence { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + uint32_t flags; + uint32_t acq_fen_fd_cnt; + int acq_fen_fd[MDP_MAX_FENCE_FD]; + int rel_fen_fd[MDP_MAX_FENCE_FD]; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +}; struct mdp_display_commit { uint32_t flags; uint32_t wait_for_finish; - struct fb_var_screeninfo var; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + struct fb_var_screeninfo var; + struct mdp_buf_fence buf_fence; }; struct mdp_page_protection { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint32_t page_protection; }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct mdp_mixer_info { int pndx; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int pnum; int ptype; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int mixer_num; int z_order; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; #define MAX_PIPE_PER_MIXER 4 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct msmfb_mixer_info_req { int mixer_num; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int cnt; struct mdp_mixer_info info[MAX_PIPE_PER_MIXER]; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; enum { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ DISPLAY_SUBSYSTEM_ID, ROTATOR_SUBSYSTEM_ID, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; enum { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ MDP_IOMMU_DOMAIN_CP, MDP_IOMMU_DOMAIN_NS, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; enum { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ MDP_WRITEBACK_MIRROR_OFF, MDP_WRITEBACK_MIRROR_ON, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ MDP_WRITEBACK_MIRROR_PAUSE, MDP_WRITEBACK_MIRROR_RESUME, +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; #endif -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ diff --git a/original-kernel-headers/linux/msm_mdp.h b/original-kernel-headers/linux/msm_mdp.h index 08a0ec4..49dc3d6 100644 --- a/original-kernel-headers/linux/msm_mdp.h +++ b/original-kernel-headers/linux/msm_mdp.h @@ -834,7 +834,6 @@ struct mdp_buf_sync { uint32_t session_id; int *acq_fen_fd; int *rel_fen_fd; - int *retire_fen_fd; }; struct mdp_async_blit_req_list { @@ -844,11 +843,19 @@ struct mdp_async_blit_req_list { }; #define MDP_DISPLAY_COMMIT_OVERLAY 1 +struct mdp_buf_fence { + uint32_t flags; + uint32_t acq_fen_fd_cnt; + int acq_fen_fd[MDP_MAX_FENCE_FD]; + int rel_fen_fd[MDP_MAX_FENCE_FD]; +}; + struct mdp_display_commit { uint32_t flags; uint32_t wait_for_finish; struct fb_var_screeninfo var; + struct mdp_buf_fence buf_fence; }; struct mdp_page_protection { |