diff options
author | Stephane Viau <sviau@codeaurora.org> | 2015-03-09 09:11:05 -0400 |
---|---|---|
committer | Rob Clark <robdclark@gmail.com> | 2015-04-01 19:29:36 -0400 |
commit | de50d351b37ba43a8d9e944e78c4df37f88d4ae2 (patch) | |
tree | 4f8fd86b9ce4cf845226eb7cabe3ecefcbc662f3 | |
parent | f52538125e4dfb2a74f2efd915430d6fc39d0124 (diff) |
drm/msm/mdp5: Update headers (remove enum mdp5_client_id)
This patch contains the generated header file of the following
change "drm/msm/mdp5: Get SMP client list from mdp5_cfg".
Signed-off-by: Stephane Viau <sviau@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
-rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 41 |
1 files changed, 7 insertions, 34 deletions
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h b/drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h index cb931caf2242..b4e262440fbd 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | |||
@@ -8,7 +8,7 @@ http://github.com/freedreno/envytools/ | |||
8 | git clone https://github.com/freedreno/envytools.git | 8 | git clone https://github.com/freedreno/envytools.git |
9 | 9 | ||
10 | The rules-ng-ng source files this header was generated from are: | 10 | The rules-ng-ng source files this header was generated from are: |
11 | - /local/mnt2/workspace2/sviau/envytools/rnndb/mdp/mdp5.xml ( 29843 bytes, from 2015-03-09 12:32:38) | 11 | - /local/mnt2/workspace2/sviau/envytools/rnndb/mdp/mdp5.xml ( 28872 bytes, from 2015-03-09 12:40:51) |
12 | - /local/mnt2/workspace2/sviau/envytools/rnndb/freedreno_copyright.xml ( 1453 bytes, from 2014-06-02 18:31:15) | 12 | - /local/mnt2/workspace2/sviau/envytools/rnndb/freedreno_copyright.xml ( 1453 bytes, from 2014-06-02 18:31:15) |
13 | - /local/mnt2/workspace2/sviau/envytools/rnndb/mdp/mdp_common.xml ( 2357 bytes, from 2015-01-23 16:20:19) | 13 | - /local/mnt2/workspace2/sviau/envytools/rnndb/mdp/mdp_common.xml ( 2357 bytes, from 2015-01-23 16:20:19) |
14 | 14 | ||
@@ -97,33 +97,6 @@ enum mdp5_pipe_bwc { | |||
97 | BWC_Q_MED = 2, | 97 | BWC_Q_MED = 2, |
98 | }; | 98 | }; |
99 | 99 | ||
100 | enum mdp5_client_id { | ||
101 | CID_UNUSED = 0, | ||
102 | CID_VIG0_Y = 1, | ||
103 | CID_VIG0_CR = 2, | ||
104 | CID_VIG0_CB = 3, | ||
105 | CID_VIG1_Y = 4, | ||
106 | CID_VIG1_CR = 5, | ||
107 | CID_VIG1_CB = 6, | ||
108 | CID_VIG2_Y = 7, | ||
109 | CID_VIG2_CR = 8, | ||
110 | CID_VIG2_CB = 9, | ||
111 | CID_DMA0_Y = 10, | ||
112 | CID_DMA0_CR = 11, | ||
113 | CID_DMA0_CB = 12, | ||
114 | CID_DMA1_Y = 13, | ||
115 | CID_DMA1_CR = 14, | ||
116 | CID_DMA1_CB = 15, | ||
117 | CID_RGB0 = 16, | ||
118 | CID_RGB1 = 17, | ||
119 | CID_RGB2 = 18, | ||
120 | CID_VIG3_Y = 19, | ||
121 | CID_VIG3_CR = 20, | ||
122 | CID_VIG3_CB = 21, | ||
123 | CID_RGB3 = 22, | ||
124 | CID_MAX = 23, | ||
125 | }; | ||
126 | |||
127 | enum mdp5_cursor_format { | 100 | enum mdp5_cursor_format { |
128 | CURSOR_FMT_ARGB8888 = 0, | 101 | CURSOR_FMT_ARGB8888 = 0, |
129 | CURSOR_FMT_ARGB1555 = 2, | 102 | CURSOR_FMT_ARGB1555 = 2, |
@@ -276,19 +249,19 @@ static inline uint32_t REG_MDP5_MDP_SMP_ALLOC_W(uint32_t i0, uint32_t i1) { retu | |||
276 | static inline uint32_t REG_MDP5_MDP_SMP_ALLOC_W_REG(uint32_t i0, uint32_t i1) { return 0x00000080 + __offset_MDP(i0) + 0x4*i1; } | 249 | static inline uint32_t REG_MDP5_MDP_SMP_ALLOC_W_REG(uint32_t i0, uint32_t i1) { return 0x00000080 + __offset_MDP(i0) + 0x4*i1; } |
277 | #define MDP5_MDP_SMP_ALLOC_W_REG_CLIENT0__MASK 0x000000ff | 250 | #define MDP5_MDP_SMP_ALLOC_W_REG_CLIENT0__MASK 0x000000ff |
278 | #define MDP5_MDP_SMP_ALLOC_W_REG_CLIENT0__SHIFT 0 | 251 | #define MDP5_MDP_SMP_ALLOC_W_REG_CLIENT0__SHIFT 0 |
279 | static inline uint32_t MDP5_MDP_SMP_ALLOC_W_REG_CLIENT0(enum mdp5_client_id val) | 252 | static inline uint32_t MDP5_MDP_SMP_ALLOC_W_REG_CLIENT0(uint32_t val) |
280 | { | 253 | { |
281 | return ((val) << MDP5_MDP_SMP_ALLOC_W_REG_CLIENT0__SHIFT) & MDP5_MDP_SMP_ALLOC_W_REG_CLIENT0__MASK; | 254 | return ((val) << MDP5_MDP_SMP_ALLOC_W_REG_CLIENT0__SHIFT) & MDP5_MDP_SMP_ALLOC_W_REG_CLIENT0__MASK; |
282 | } | 255 | } |
283 | #define MDP5_MDP_SMP_ALLOC_W_REG_CLIENT1__MASK 0x0000ff00 | 256 | #define MDP5_MDP_SMP_ALLOC_W_REG_CLIENT1__MASK 0x0000ff00 |
284 | #define MDP5_MDP_SMP_ALLOC_W_REG_CLIENT1__SHIFT 8 | 257 | #define MDP5_MDP_SMP_ALLOC_W_REG_CLIENT1__SHIFT 8 |
285 | static inline uint32_t MDP5_MDP_SMP_ALLOC_W_REG_CLIENT1(enum mdp5_client_id val) | 258 | static inline uint32_t MDP5_MDP_SMP_ALLOC_W_REG_CLIENT1(uint32_t val) |
286 | { | 259 | { |
287 | return ((val) << MDP5_MDP_SMP_ALLOC_W_REG_CLIENT1__SHIFT) & MDP5_MDP_SMP_ALLOC_W_REG_CLIENT1__MASK; | 260 | return ((val) << MDP5_MDP_SMP_ALLOC_W_REG_CLIENT1__SHIFT) & MDP5_MDP_SMP_ALLOC_W_REG_CLIENT1__MASK; |
288 | } | 261 | } |
289 | #define MDP5_MDP_SMP_ALLOC_W_REG_CLIENT2__MASK 0x00ff0000 | 262 | #define MDP5_MDP_SMP_ALLOC_W_REG_CLIENT2__MASK 0x00ff0000 |
290 | #define MDP5_MDP_SMP_ALLOC_W_REG_CLIENT2__SHIFT 16 | 263 | #define MDP5_MDP_SMP_ALLOC_W_REG_CLIENT2__SHIFT 16 |
291 | static inline uint32_t MDP5_MDP_SMP_ALLOC_W_REG_CLIENT2(enum mdp5_client_id val) | 264 | static inline uint32_t MDP5_MDP_SMP_ALLOC_W_REG_CLIENT2(uint32_t val) |
292 | { | 265 | { |
293 | return ((val) << MDP5_MDP_SMP_ALLOC_W_REG_CLIENT2__SHIFT) & MDP5_MDP_SMP_ALLOC_W_REG_CLIENT2__MASK; | 266 | return ((val) << MDP5_MDP_SMP_ALLOC_W_REG_CLIENT2__SHIFT) & MDP5_MDP_SMP_ALLOC_W_REG_CLIENT2__MASK; |
294 | } | 267 | } |
@@ -298,19 +271,19 @@ static inline uint32_t REG_MDP5_MDP_SMP_ALLOC_R(uint32_t i0, uint32_t i1) { retu | |||
298 | static inline uint32_t REG_MDP5_MDP_SMP_ALLOC_R_REG(uint32_t i0, uint32_t i1) { return 0x00000130 + __offset_MDP(i0) + 0x4*i1; } | 271 | static inline uint32_t REG_MDP5_MDP_SMP_ALLOC_R_REG(uint32_t i0, uint32_t i1) { return 0x00000130 + __offset_MDP(i0) + 0x4*i1; } |
299 | #define MDP5_MDP_SMP_ALLOC_R_REG_CLIENT0__MASK 0x000000ff | 272 | #define MDP5_MDP_SMP_ALLOC_R_REG_CLIENT0__MASK 0x000000ff |
300 | #define MDP5_MDP_SMP_ALLOC_R_REG_CLIENT0__SHIFT 0 | 273 | #define MDP5_MDP_SMP_ALLOC_R_REG_CLIENT0__SHIFT 0 |
301 | static inline uint32_t MDP5_MDP_SMP_ALLOC_R_REG_CLIENT0(enum mdp5_client_id val) | 274 | static inline uint32_t MDP5_MDP_SMP_ALLOC_R_REG_CLIENT0(uint32_t val) |
302 | { | 275 | { |
303 | return ((val) << MDP5_MDP_SMP_ALLOC_R_REG_CLIENT0__SHIFT) & MDP5_MDP_SMP_ALLOC_R_REG_CLIENT0__MASK; | 276 | return ((val) << MDP5_MDP_SMP_ALLOC_R_REG_CLIENT0__SHIFT) & MDP5_MDP_SMP_ALLOC_R_REG_CLIENT0__MASK; |
304 | } | 277 | } |
305 | #define MDP5_MDP_SMP_ALLOC_R_REG_CLIENT1__MASK 0x0000ff00 | 278 | #define MDP5_MDP_SMP_ALLOC_R_REG_CLIENT1__MASK 0x0000ff00 |
306 | #define MDP5_MDP_SMP_ALLOC_R_REG_CLIENT1__SHIFT 8 | 279 | #define MDP5_MDP_SMP_ALLOC_R_REG_CLIENT1__SHIFT 8 |
307 | static inline uint32_t MDP5_MDP_SMP_ALLOC_R_REG_CLIENT1(enum mdp5_client_id val) | 280 | static inline uint32_t MDP5_MDP_SMP_ALLOC_R_REG_CLIENT1(uint32_t val) |
308 | { | 281 | { |
309 | return ((val) << MDP5_MDP_SMP_ALLOC_R_REG_CLIENT1__SHIFT) & MDP5_MDP_SMP_ALLOC_R_REG_CLIENT1__MASK; | 282 | return ((val) << MDP5_MDP_SMP_ALLOC_R_REG_CLIENT1__SHIFT) & MDP5_MDP_SMP_ALLOC_R_REG_CLIENT1__MASK; |
310 | } | 283 | } |
311 | #define MDP5_MDP_SMP_ALLOC_R_REG_CLIENT2__MASK 0x00ff0000 | 284 | #define MDP5_MDP_SMP_ALLOC_R_REG_CLIENT2__MASK 0x00ff0000 |
312 | #define MDP5_MDP_SMP_ALLOC_R_REG_CLIENT2__SHIFT 16 | 285 | #define MDP5_MDP_SMP_ALLOC_R_REG_CLIENT2__SHIFT 16 |
313 | static inline uint32_t MDP5_MDP_SMP_ALLOC_R_REG_CLIENT2(enum mdp5_client_id val) | 286 | static inline uint32_t MDP5_MDP_SMP_ALLOC_R_REG_CLIENT2(uint32_t val) |
314 | { | 287 | { |
315 | return ((val) << MDP5_MDP_SMP_ALLOC_R_REG_CLIENT2__SHIFT) & MDP5_MDP_SMP_ALLOC_R_REG_CLIENT2__MASK; | 288 | return ((val) << MDP5_MDP_SMP_ALLOC_R_REG_CLIENT2__SHIFT) & MDP5_MDP_SMP_ALLOC_R_REG_CLIENT2__MASK; |
316 | } | 289 | } |