Merge "msm: mdss: Correct MDSS display wakeup time calculation"

This commit is contained in:
Linux Build Service Account 2017-05-27 18:12:04 -07:00 committed by Gerrit - the friendly Code Review server
commit bc1c25b0ef

View file

@ -2736,10 +2736,7 @@ int mdss_mdp_display_wakeup_time(struct mdss_mdp_ctl *ctl,
if (!clk_period)
return -EINVAL;
time_of_line = (pinfo->lcdc.h_back_porch +
pinfo->lcdc.h_front_porch +
pinfo->lcdc.h_pulse_width +
pinfo->xres) * clk_period;
time_of_line = mdss_panel_get_htotal(pinfo, true) * clk_period;
time_of_line /= 1000; /* in nano second */
if (!time_of_line)
@ -2747,10 +2744,7 @@ int mdss_mdp_display_wakeup_time(struct mdss_mdp_ctl *ctl,
current_line = ctl->ops.read_line_cnt_fnc(ctl);
total_line = pinfo->lcdc.v_back_porch +
pinfo->lcdc.v_front_porch +
pinfo->lcdc.v_pulse_width +
pinfo->yres;
total_line = mdss_panel_get_vtotal(pinfo);
if (current_line >= total_line)
time_to_vsync = time_of_line * total_line;