diff options
author | Stephane Viau <sviau@codeaurora.org> | 2015-03-24 09:30:01 -0400 |
---|---|---|
committer | Rob Clark <robdclark@gmail.com> | 2015-04-01 19:29:36 -0400 |
commit | 87ed66c41441589b9718331410ceea7aeb8a740b (patch) | |
tree | d180f2ca49633855accf5470107a722fb6b5c792 | |
parent | 02dfd9d2ba2b86068a23fb1ff8b9b633a61e732e (diff) |
drm/msm/mdp5: Update headers (add CTL flush bits)
Some upcoming targets have more bits to set in CTL_FLUSH
registers.
Example: msm8x16 needs to set TIMING1 bit so that some of the
INTF1's interface registers get flushed.
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 | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h b/drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h index b4e262440fbd..b9a4ded6e400 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | |||
@@ -8,9 +8,9 @@ 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 ( 28872 bytes, from 2015-03-09 12:40:51) | 11 | - /local/mnt2/workspace2/sviau/envytools/rnndb/mdp/mdp5.xml ( 29312 bytes, from 2015-03-23 21:18:48) |
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-03-23 20:38:49) |
14 | 14 | ||
15 | Copyright (C) 2013-2015 by the following authors: | 15 | Copyright (C) 2013-2015 by the following authors: |
16 | - Rob Clark <robdclark@gmail.com> (robclark) | 16 | - Rob Clark <robdclark@gmail.com> (robclark) |
@@ -458,11 +458,19 @@ static inline uint32_t REG_MDP5_CTL_FLUSH(uint32_t i0) { return 0x00000018 + __o | |||
458 | #define MDP5_CTL_FLUSH_DSPP0 0x00002000 | 458 | #define MDP5_CTL_FLUSH_DSPP0 0x00002000 |
459 | #define MDP5_CTL_FLUSH_DSPP1 0x00004000 | 459 | #define MDP5_CTL_FLUSH_DSPP1 0x00004000 |
460 | #define MDP5_CTL_FLUSH_DSPP2 0x00008000 | 460 | #define MDP5_CTL_FLUSH_DSPP2 0x00008000 |
461 | #define MDP5_CTL_FLUSH_WB 0x00010000 | ||
461 | #define MDP5_CTL_FLUSH_CTL 0x00020000 | 462 | #define MDP5_CTL_FLUSH_CTL 0x00020000 |
462 | #define MDP5_CTL_FLUSH_VIG3 0x00040000 | 463 | #define MDP5_CTL_FLUSH_VIG3 0x00040000 |
463 | #define MDP5_CTL_FLUSH_RGB3 0x00080000 | 464 | #define MDP5_CTL_FLUSH_RGB3 0x00080000 |
464 | #define MDP5_CTL_FLUSH_LM5 0x00100000 | 465 | #define MDP5_CTL_FLUSH_LM5 0x00100000 |
465 | #define MDP5_CTL_FLUSH_DSPP3 0x00200000 | 466 | #define MDP5_CTL_FLUSH_DSPP3 0x00200000 |
467 | #define MDP5_CTL_FLUSH_CURSOR_0 0x00400000 | ||
468 | #define MDP5_CTL_FLUSH_CURSOR_1 0x00800000 | ||
469 | #define MDP5_CTL_FLUSH_CHROMADOWN_0 0x04000000 | ||
470 | #define MDP5_CTL_FLUSH_TIMING_3 0x10000000 | ||
471 | #define MDP5_CTL_FLUSH_TIMING_2 0x20000000 | ||
472 | #define MDP5_CTL_FLUSH_TIMING_1 0x40000000 | ||
473 | #define MDP5_CTL_FLUSH_TIMING_0 0x80000000 | ||
466 | 474 | ||
467 | static inline uint32_t REG_MDP5_CTL_START(uint32_t i0) { return 0x0000001c + __offset_CTL(i0); } | 475 | static inline uint32_t REG_MDP5_CTL_START(uint32_t i0) { return 0x0000001c + __offset_CTL(i0); } |
468 | 476 | ||