diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-21 05:33:42 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-21 05:33:42 -0800 |
| commit | 61c51021dfc38ac5490e2df6b7e51ec957b870ba (patch) | |
| tree | abec3d8181670a1596fec7ff8255dcce8f33dc12 | |
| parent | c56e71975be16dd791a03ea3017fb45495cecff3 (diff) | |
| parent | 82fc7a7b260d89941790c9ea44be87d917ce26c9 (diff) | |
Merge "msm: mdss: Correct mixer enumeration for sdm630"
| -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 b8f7a74ceede..e258f258aeca 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_ctl.c +++ b/drivers/video/fbdev/msm/mdss_mdp_ctl.c @@ -4770,6 +4770,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: @@ -4777,6 +4779,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; |