diff options
| author | Naseer Ahmed <naseer@codeaurora.org> | 2013-06-25 17:13:15 -0400 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2013-06-26 11:21:52 -0700 |
| commit | 35fdd7afdd77fede06756216ab022f36c049caaa (patch) | |
| tree | 4ccf662181f7ee8517c30aa5d3a6460f453f5086 | |
| parent | daefb20bf0a0d3095402bba606876fa99e149cab (diff) | |
| download | msm8960-35fdd7afdd77fede06756216ab022f36c049caaa.tar.gz | |
mdp: Update header for retire fence
Change-Id: I100cbf7ef4c08ff1cd280bfe5b726be1f41665a0
| -rw-r--r-- | kernel-headers/linux/msm_mdp.h | 26 | ||||
| -rwxr-xr-x | original-kernel-headers/linux/msm_mdp.h | 8 |
2 files changed, 10 insertions, 24 deletions
diff --git a/kernel-headers/linux/msm_mdp.h b/kernel-headers/linux/msm_mdp.h index 310414d..010b549 100644 --- a/kernel-headers/linux/msm_mdp.h +++ b/kernel-headers/linux/msm_mdp.h @@ -566,54 +566,46 @@ struct mdp_buf_sync { int *acq_fen_fd; int *rel_fen_fd; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ -}; -struct mdp_buf_fence { - uint32_t flags; - uint32_t acq_fen_fd_cnt; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ - int acq_fen_fd[MDP_MAX_FENCE_FD]; - int rel_fen_fd[MDP_MAX_FENCE_FD]; + int *retire_fen_fd; }; #define MDP_DISPLAY_COMMIT_OVERLAY 0x00000001 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct mdp_display_commit { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ uint32_t flags; uint32_t wait_for_finish; struct fb_var_screeninfo var; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct mdp_page_protection { uint32_t page_protection; }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct mdp_mixer_info { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int pndx; int pnum; int ptype; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int mixer_num; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int z_order; }; #define MAX_PIPE_PER_MIXER 5 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct msmfb_mixer_info_req { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int mixer_num; int cnt; struct mdp_mixer_info info[MAX_PIPE_PER_MIXER]; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ enum { DISPLAY_SUBSYSTEM_ID, ROTATOR_SUBSYSTEM_ID, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ enum { MDP_WRITEBACK_MIRROR_OFF, MDP_WRITEBACK_MIRROR_ON, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ MDP_WRITEBACK_MIRROR_PAUSE, +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ MDP_WRITEBACK_MIRROR_RESUME, }; #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 394394b..641f423 100755 --- a/original-kernel-headers/linux/msm_mdp.h +++ b/original-kernel-headers/linux/msm_mdp.h @@ -573,13 +573,7 @@ struct mdp_buf_sync { uint32_t acq_fen_fd_cnt; int *acq_fen_fd; int *rel_fen_fd; -}; - -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]; + int *retire_fen_fd; }; #define MDP_DISPLAY_COMMIT_OVERLAY 0x00000001 |