diff options
| author | Jayant Shekhar <jshekhar@codeaurora.org> | 2017-02-20 18:02:58 +0530 |
|---|---|---|
| committer | Jayant Shekhar <jshekhar@codeaurora.org> | 2017-02-21 10:57:09 +0530 |
| commit | 82fc7a7b260d89941790c9ea44be87d917ce26c9 (patch) | |
| tree | 3da804606375c963e2f54cd7a9077e5c55d3d5a2 | |
| parent | 2aa89ab3ff59a788321bc6af782d639cfc8dab1f (diff) | |
msm: mdss: Correct mixer enumeration for sdm630
For sdm630, LM0 and LM2 layer-mixers are present.
LM1 interface mixer is removed. So, enumerate the
LM2 mixer correctly.
Change-Id: Iceff8f215ca34e95556368a13a9b0c8aeb7c2ef3
Signed-off-by: Jayant Shekhar <jshekhar@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_ctl.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_ctl.c b/drivers/video/fbdev/msm/mdss_mdp_ctl.c index acb356fc681a..b87d7cda1479 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_ctl.c +++ b/drivers/video/fbdev/msm/mdss_mdp_ctl.c @@ -4768,6 +4768,8 @@ static void __mdss_mdp_mixer_get_offsets(u32 mixer_num, static inline int __mdss_mdp_mixer_get_hw_num(struct mdss_mdp_mixer *mixer) { + struct mdss_data_type *mdata = mdss_mdp_get_mdata(); + /* * mapping to hardware expectation of actual mixer programming to * happen on following registers: @@ -4775,6 +4777,11 @@ static inline int __mdss_mdp_mixer_get_hw_num(struct mdss_mdp_mixer *mixer) * WB: 3, 4 * With some exceptions on certain revisions */ + + if (mdata->mdp_rev == MDSS_MDP_HW_REV_330 + && mixer->num == MDSS_MDP_INTF_LAYERMIXER1) + return MDSS_MDP_INTF_LAYERMIXER2; + if (mixer->type == MDSS_MDP_MIXER_TYPE_WRITEBACK) { u32 wb_offset; |