diff options
| author | Naseer Ahmed <naseer@codeaurora.org> | 2013-09-11 18:09:18 -0400 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2013-09-13 13:52:46 -0700 |
| commit | f381cb18448e109379fcf6af8f887776de7c3343 (patch) | |
| tree | 0e36fa205962d1cf6c1469ae0bf7fc39f9bba169 | |
| parent | 39255afaa96f3cff1ab99d98bb70c85723bb1c97 (diff) | |
| download | msm8x74-f381cb18448e109379fcf6af8f887776de7c3343.tar.gz | |
mdp: Update header for retire fence
b/10153314 -- [HH] hwc_set_primary blocks in uninterruptible sleep for no apparent reason
Change-Id: I06f4075ca01b7a376d77c0d08e6912902bd67a8f
Signed-off-by: Iliyan Malchev <malchev@google.com>
| -rw-r--r-- | kernel-headers/linux/msm_mdp.h | 29 | ||||
| -rw-r--r-- | original-kernel-headers/linux/msm_mdp.h | 9 |
2 files changed, 12 insertions, 26 deletions
diff --git a/kernel-headers/linux/msm_mdp.h b/kernel-headers/linux/msm_mdp.h index c0aef34..205df7b 100644 --- a/kernel-headers/linux/msm_mdp.h +++ b/kernel-headers/linux/msm_mdp.h @@ -836,66 +836,59 @@ 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; - uint32_t count; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + uint32_t count; 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; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct fb_var_screeninfo var; - struct mdp_buf_fence buf_fence; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; 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 49dc3d6..08a0ec4 100644 --- a/original-kernel-headers/linux/msm_mdp.h +++ b/original-kernel-headers/linux/msm_mdp.h @@ -834,6 +834,7 @@ 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 { @@ -843,19 +844,11 @@ 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 { |