Merge "msm: mdss: fix logic in DSI data lane overflow recovery" (3eaf8efc) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_intf_video.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -173,8 +173,7 @@ static void mdss_mdp_video_intf_recovery(void *data, int event)
		pr_err("Unable to calculate clock period\n");
		return;
		}
		min_ln_cnt = pinfo->lcdc.v_back_porch + pinfo->lcdc.v_front_porch
		+ pinfo->lcdc.v_pulse_width;
		min_ln_cnt = pinfo->lcdc.v_back_porch + pinfo->lcdc.v_pulse_width;
		active_lns_cnt = pinfo->yres;
		time_of_line = (pinfo->lcdc.h_back_porch +
		pinfo->lcdc.h_front_porch +
		@@ -182,7 +181,8 @@ static void mdss_mdp_video_intf_recovery(void *data, int event)
		pinfo->xres) * clk_period;

		/* delay in micro seconds */
		delay = (time_of_line * min_ln_cnt) / 1000000;
		delay = (time_of_line * (min_ln_cnt +
		pinfo->lcdc.v_front_porch)) / 1000000;

		/*
		* Wait for max delay before
		@@ -194,7 +194,8 @@ static void mdss_mdp_video_intf_recovery(void *data, int event)
		while (1) {
		line_cnt = mdss_mdp_video_line_count(ctl);

		if ((line_cnt >= min_ln_cnt) && (line_cnt < active_lns_cnt)) {
		if ((line_cnt >= min_ln_cnt) && (line_cnt <
		(active_lns_cnt + min_ln_cnt))) {
		pr_debug("%s, Needed lines left line_cnt=%d\n",
		__func__, line_cnt);
		return;