diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-16 04:29:01 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-16 04:29:00 -0800 |
| commit | a295b7196bb1aefc2f4550f7649f0a08ce1cd377 (patch) | |
| tree | d75b732094c07d705eec875983a0574fde52bf0b /drivers | |
| parent | a2dbdc2c6ef20404eaa9225c43ffe81a9673f880 (diff) | |
| parent | 25cd29c57bd874ecf10488fa7a636e43665568d4 (diff) | |
Merge "msm: mdss: Fix equation to calculate prefill count for amortization"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_pipe.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pipe.c b/drivers/video/fbdev/msm/mdss_mdp_pipe.c index 6311352cb0cf..6870193166f2 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_pipe.c +++ b/drivers/video/fbdev/msm/mdss_mdp_pipe.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -2461,7 +2461,8 @@ static u32 __get_ts_count(struct mdss_mdp_pipe *pipe, if (pipe && pipe->multirect.mode == MDSS_MDP_PIPE_MULTIRECT_SERIAL) { __get_ordered_rects(pipe, &low_pipe, &high_pipe); - ts_ypos = high_pipe->dst.y - low_pipe->dst.y - 1; + ts_ypos = high_pipe->dst.y - + (low_pipe->dst.y + low_pipe->dst.h) - 1; rate_factor = TS_CLK / fps; ts_count = mult_frac(ts_ypos, rate_factor, v_total); MDSS_XLOG(ts_ypos, rate_factor, ts_count); @@ -2535,7 +2536,7 @@ static u32 __get_ts_bytes(struct mdss_mdp_pipe *pipe, /* calculate ts bytes as the sum of both rects */ ts_bytes_low = __calc_ts_bytes(&low_pipe->src, fps, low_pipe->src_fmt->bpp); - ts_bytes_high = __calc_ts_bytes(&low_pipe->src, fps, + ts_bytes_high = __calc_ts_bytes(&high_pipe->src, fps, high_pipe->src_fmt->bpp); ts_bytes = ts_bytes_low + ts_bytes_high; |