diff options
author | Rob Clark <robdclark@gmail.com> | 2013-11-30 12:45:48 -0500 |
---|---|---|
committer | Rob Clark <robdclark@gmail.com> | 2014-01-09 14:38:59 -0500 |
commit | facb4f4e7fae93ddfcfc2a5f2d0417185a7029ed (patch) | |
tree | 8f8d12c091997d7d5871a0e0f9ae704a960e0615 /drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | |
parent | 2e54a92ff2ec6cd70f748d990a3f6646f9b691f3 (diff) | |
download | op-kernel-dev-facb4f4e7fae93ddfcfc2a5f2d0417185a7029ed.zip op-kernel-dev-facb4f4e7fae93ddfcfc2a5f2d0417185a7029ed.tar.gz |
drm/msm: resync generated headers
resync to latest envytools db, add mdp5 registers
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h')
-rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h index eb015c8..5da111f 100644 --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h @@ -23,6 +23,7 @@ #include <linux/regulator/consumer.h> #include "msm_drv.h" +#include "mdp/mdp_common.xml.h" #include "mdp4.xml.h" @@ -75,8 +76,8 @@ struct mdp4_platform_config { struct mdp4_format { struct msm_format base; - enum mdp4_bpc bpc_r, bpc_g, bpc_b; - enum mdp4_bpc_alpha bpc_a; + enum mdp_bpc bpc_r, bpc_g, bpc_b; + enum mdp_bpc_alpha bpc_a; uint8_t unpack[4]; bool alpha_enable, unpack_tight; uint8_t cpp, unpack_count; @@ -134,7 +135,7 @@ static inline uint32_t dma2err(enum mdp4_dma dma) } static inline uint32_t mixercfg(int mixer, enum mdp4_pipe pipe, - enum mdp4_mixer_stage_id stage) + enum mdp_mixer_stage_id stage) { uint32_t mixer_cfg = 0; |