Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82fc7a7b authored by Jayant Shekhar's avatar Jayant Shekhar
Browse files

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: default avatarJayant Shekhar <jshekhar@codeaurora.org>
parent 2aa89ab3

drivers/video/fbdev/msm/mdss_mdp_ctl.c

+7 −0
Original line number Diff line number Diff line
@@ -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;