Merge "msm: mdss: Update screen resolution for Assertive Display" (cdef5d84) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_pp.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -3218,6 +3218,7 @@ static int mdss_mdp_ad_setup(struct msm_fb_data_type *mfd)
		struct mdss_mdp_ctl *ctl = mfd_to_ctl(mfd);
		struct msm_fb_data_type *bl_mfd;
		char __iomem *base;
		u32 temp;
		u32 bypass = MDSS_PP_AD_BYPASS_DEF, bl;

		ret = mdss_mdp_get_ad(mfd, &ad);
		@@ -3286,6 +3287,21 @@ static int mdss_mdp_ad_setup(struct msm_fb_data_type *mfd)
		pp_ad_init_write(ad);
		}

		/* update ad screen size if it has changed since last configuration */
		if (mfd->panel_info->type == WRITEBACK_PANEL &&
		(ad->init.frame_w != ctl->width \|\|
		ad->init.frame_h != ctl->height)) {
		pr_debug("changing from %dx%d to %dx%d", ad->init.frame_w,
		ad->init.frame_h,
		ctl->width,
		ctl->height);
		ad->init.frame_w = ctl->width;
		ad->init.frame_h = ctl->height;
		temp = ad->init.frame_w << 16;
		temp \|= ad->init.frame_h & 0xFFFF;
		writel_relaxed(temp, base + MDSS_MDP_REG_AD_FRAME_SIZE);
		}

		if ((ad->sts & PP_STS_ENABLE) && PP_AD_STATE_IS_READY(ad->state)) {
		bypass = 0;
		ret = 1;