Merge "msm: mdss: Correct mixer enumeration for sdm630" (61c51021) · Commits · e / devices / android_kernel_sony_msm8998

drivers/video/fbdev/msm/mdss_mdp_ctl.c

+7 −0

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