msm: mdss: add support for non-compressed bw for ib

Starting sde 3.0, driver needs to use uncompressed
bandwidth calculation for the ib bandwidth vote.
Add support to use this calculation and enable
it for sde 3.0.

Change-Id: I6a7ba7573a67a52bddb4881415217d7401c97cf3
Signed-off-by: Ingrid Gallardo <ingridg@codeaurora.org>

5 files changed, 49 insertions, 33 deletions

diff --git a/drivers/video/fbdev/msm/mdss.h b/drivers/video/fbdev/msm/mdss.h
index 67012bf6d784..d9397cc5614d 100644
--- a/drivers/video/fbdev/msm/mdss.h
+++ b/drivers/video/fbdev/msm/mdss.h
@@ -191,6 +191,7 @@ enum mdss_qos_settings {
 	MDSS_QOS_VBLANK_PANIC_CTRL,
 	MDSS_QOS_TS_PREFILL,
 	MDSS_QOS_REMAPPER,
+	MDSS_QOS_IB_NOCR,
 	MDSS_QOS_MAX,
 };
 
diff --git a/drivers/video/fbdev/msm/mdss_mdp.c b/drivers/video/fbdev/msm/mdss_mdp.c
index 52887b1336a0..4fad99d5617c 100644
--- a/drivers/video/fbdev/msm/mdss_mdp.c
+++ b/drivers/video/fbdev/msm/mdss_mdp.c
@@ -1535,6 +1535,7 @@ static void mdss_mdp_hw_rev_caps_init(struct mdss_data_type *mdata)
 		set_bit(MDSS_QOS_PER_PIPE_LUT, mdata->mdss_qos_map);
 		set_bit(MDSS_QOS_SIMPLIFIED_PREFILL, mdata->mdss_qos_map);
 		set_bit(MDSS_QOS_TS_PREFILL, mdata->mdss_qos_map);
+		set_bit(MDSS_QOS_IB_NOCR, mdata->mdss_qos_map);
 		set_bit(MDSS_CAPS_YUV_CONFIG, mdata->mdss_caps_map);
 		set_bit(MDSS_CAPS_SCM_RESTORE_NOT_REQUIRED,
 			mdata->mdss_caps_map);
diff --git a/drivers/video/fbdev/msm/mdss_mdp.h b/drivers/video/fbdev/msm/mdss_mdp.h
index 85945890a7a4..b47c784f1582 100644
--- a/drivers/video/fbdev/msm/mdss_mdp.h
+++ b/drivers/video/fbdev/msm/mdss_mdp.h
@@ -291,6 +291,7 @@ enum perf_calc_vote_mode {
 
 struct mdss_mdp_perf_params {
 	u64 bw_overlap;
+	u64 bw_overlap_nocr;
 	u64 bw_writeback;
 	u64 bw_prefill;
 	u64 max_per_pipe_ib;
@@ -1479,8 +1480,8 @@ int mdss_mdp_perf_bw_check(struct mdss_mdp_ctl *ctl,
 		struct mdss_mdp_pipe **right_plist, int right_cnt);
 int mdss_mdp_perf_bw_check_pipe(struct mdss_mdp_perf_params *perf,
 		struct mdss_mdp_pipe *pipe);
-u32 mdss_mdp_get_pipe_overlap_bw(struct mdss_mdp_pipe *pipe,
-	struct mdss_rect *roi, u32 flags);
+int mdss_mdp_get_pipe_overlap_bw(struct mdss_mdp_pipe *pipe,
+	struct mdss_rect *roi, u64 *quota, u64 *quota_nocr, u32 flags);
 int mdss_mdp_get_panel_params(struct mdss_mdp_pipe *pipe,
 	struct mdss_mdp_mixer *mixer, u32 *fps, u32 *v_total,
 	u32 *h_total, u32 *xres);
diff --git a/drivers/video/fbdev/msm/mdss_mdp_ctl.c b/drivers/video/fbdev/msm/mdss_mdp_ctl.c
index 84040d6eb0bf..908807104770 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_ctl.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_ctl.c
@@ -706,14 +706,15 @@ int mdss_mdp_get_panel_params(struct mdss_mdp_pipe *pipe,
 	return 0;
 }
 
-u32 mdss_mdp_get_pipe_overlap_bw(struct mdss_mdp_pipe *pipe,
-	struct mdss_rect *roi, u32 flags)
+int mdss_mdp_get_pipe_overlap_bw(struct mdss_mdp_pipe *pipe,
+	struct mdss_rect *roi, u64 *quota, u64 *quota_nocr, u32 flags)
 {
 	struct mdss_data_type *mdata = mdss_mdp_get_mdata();
 	struct mdss_mdp_mixer *mixer = pipe->mixer_left;
 	struct mdss_rect src, dst;
-	u32 v_total, fps, h_total, xres;
-	u32 quota, src_h;
+	u32 v_total, fps, h_total, xres, src_h;
+	*quota = 0;
+	*quota_nocr = 0;
 
 	if (mdss_mdp_get_panel_params(pipe, mixer, &fps, &v_total,
 			&h_total, &xres)) {
@@ -735,7 +736,7 @@ u32 mdss_mdp_get_pipe_overlap_bw(struct mdss_mdp_pipe *pipe,
 	 */
 	src_h = DECIMATED_DIMENSION(src.h, pipe->vert_deci);
 
-	quota = fps * src.w * src_h;
+	*quota = fps * src.w * src_h;
 
 	if (pipe->src_fmt->chroma_sample == MDSS_MDP_CHROMA_420)
 		/*
@@ -743,17 +744,18 @@ u32 mdss_mdp_get_pipe_overlap_bw(struct mdss_mdp_pipe *pipe,
 		 * need to allocate bw for extra lines that will be fetched
 		 */
 		if (pipe->vert_deci)
-			quota *= 2;
+			*quota *= 2;
 		else
-			quota = (quota * 3) / 2;
+			*quota = (*quota * 3) / 2;
 	else
-		quota *= pipe->src_fmt->bpp;
+		*quota *= pipe->src_fmt->bpp;
 
 	if (mixer->rotator_mode) {
 		if (test_bit(MDSS_QOS_OVERHEAD_FACTOR,
 				mdata->mdss_qos_map)) {
 			/* rotator read */
-			quota = apply_comp_ratio_factor(quota,
+			*quota_nocr += (*quota * 2);
+			*quota = apply_comp_ratio_factor(*quota,
 				pipe->src_fmt, &pipe->comp_ratio);
 			/*
 			 * rotator write: here we are using src_fmt since
@@ -764,28 +766,31 @@ u32 mdss_mdp_get_pipe_overlap_bw(struct mdss_mdp_pipe *pipe,
 			 * calculate the bandwidth, but leaving this
 			 * calculation as per current support.
 			 */
-			quota += apply_comp_ratio_factor(quota,
+			*quota += apply_comp_ratio_factor(*quota,
 				pipe->src_fmt, &pipe->comp_ratio);
 		} else {
-			quota *= 2; /* bus read + write */
+			*quota *= 2; /* bus read + write */
 		}
 	} else {
 
-		quota = mult_frac(quota, v_total, dst.h);
+		*quota = DIV_ROUND_UP_ULL(*quota * v_total, dst.h);
 		if (!mixer->ctl->is_video_mode)
-			quota = mult_frac(quota, h_total, xres);
+			*quota = DIV_ROUND_UP_ULL(*quota * h_total, xres);
+
+		*quota_nocr = *quota;
 
 		if (test_bit(MDSS_QOS_OVERHEAD_FACTOR,
 				mdata->mdss_qos_map))
-			quota = apply_comp_ratio_factor(quota,
+			*quota = apply_comp_ratio_factor(*quota,
 				pipe->src_fmt, &pipe->comp_ratio);
 	}
 
-	pr_debug("quota:%d src.w:%d src.h%d comp:[%d, %d]\n",
-		quota, src.w, src_h, pipe->comp_ratio.numer,
+
+	pr_debug("quota:%llu nocr:%llu src.w:%d src.h%d comp:[%d, %d]\n",
+		*quota, *quota_nocr, src.w, src_h, pipe->comp_ratio.numer,
 		pipe->comp_ratio.denom);
 
-	return quota;
+	return 0;
 }
 
 static inline bool validate_comp_ratio(struct mult_factor *factor)
@@ -1109,14 +1114,15 @@ int mdss_mdp_perf_calc_pipe(struct mdss_mdp_pipe *pipe,
 		 pipe->src.w, src_h, pipe->dst.w, pipe->dst.h, pipe->dst.y,
 		 pipe->src_fmt->bpp, pipe->src_fmt->is_yuv);
 
-	perf->bw_overlap = mdss_mdp_get_pipe_overlap_bw(pipe, roi,
-		flags);
+	if (mdss_mdp_get_pipe_overlap_bw(pipe, roi, &perf->bw_overlap,
+			&perf->bw_overlap_nocr, flags))
+		pr_err("failure calculating overlap bw!\n");
 
 	perf->mdp_clk_rate = get_pipe_mdp_clk_rate(pipe, src, dst,
 		fps, v_total, flags);
 
-	pr_debug("bw:%llu clk:%d\n", perf->bw_overlap,
-		perf->mdp_clk_rate);
+	pr_debug("bw:%llu bw_nocr:%llu clk:%d\n", perf->bw_overlap,
+		perf->bw_overlap_nocr, perf->mdp_clk_rate);
 
 	if (pipe->flags & MDP_SOLID_FILL) {
 		perf->bw_overlap = 0;
@@ -1325,9 +1331,14 @@ static void mdss_mdp_perf_calc_mixer(struct mdss_mdp_mixer *mixer,
 			flags))
 			continue;
 
-		if (!mdss_mdp_is_nrt_ctl_path(mixer->ctl))
+		if (!mdss_mdp_is_nrt_ctl_path(mixer->ctl)) {
+			u64 per_pipe_ib =
+			    test_bit(MDSS_QOS_IB_NOCR, mdata->mdss_qos_map) ?
+			    tmp.bw_overlap_nocr : tmp.bw_overlap;
+
 			perf->max_per_pipe_ib = max(perf->max_per_pipe_ib,
-			    tmp.bw_overlap);
+			    per_pipe_ib);
+		}
 
 		bitmap_or(perf->bw_vote_mode, perf->bw_vote_mode,
 			tmp.bw_vote_mode, MDSS_MDP_BW_MODE_MAX);
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pipe.c b/drivers/video/fbdev/msm/mdss_mdp_pipe.c
index 75bd02dac1e4..e0ead6c1c5b7 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_pipe.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_pipe.c
@@ -2457,7 +2457,7 @@ static u32 __get_ts_bytes(struct mdss_mdp_pipe *pipe,
 	struct mdss_data_type *mdata = mdss_mdp_get_mdata();
 	struct mdss_mdp_pipe *low_pipe, *high_pipe;
 	u32 v_total, fps, h_total, xres;
-	u32 low_pipe_bw, high_pipe_bw;
+	u64 low_pipe_bw, high_pipe_bw, temp;
 	u32 ts_bytes_low, ts_bytes_high;
 	u64 ts_bytes = 0;
 
@@ -2503,17 +2503,19 @@ static u32 __get_ts_bytes(struct mdss_mdp_pipe *pipe,
 		__get_ordered_rects(pipe, &low_pipe, &high_pipe);
 
 		/* calculate amortization using per-pipe bw */
-		low_pipe_bw = mdss_mdp_get_pipe_overlap_bw(low_pipe,
-			&low_pipe->mixer_left->roi, 0);
-		high_pipe_bw = mdss_mdp_get_pipe_overlap_bw(high_pipe,
-			&high_pipe->mixer_left->roi, 0);
+		mdss_mdp_get_pipe_overlap_bw(low_pipe,
+			&low_pipe->mixer_left->roi,
+			&low_pipe_bw, &temp, 0);
+		mdss_mdp_get_pipe_overlap_bw(high_pipe,
+			&high_pipe->mixer_left->roi,
+			&high_pipe_bw, &temp, 0);
 
 		/* amortize depending on the lower pipe amortization */
 		if (mdss_mdp_is_amortizable_pipe(low_pipe, mixer, mdata))
-			ts_bytes = max(low_pipe_bw, high_pipe_bw) /
-			     19200000;
+			ts_bytes = DIV_ROUND_UP_ULL(max(low_pipe_bw,
+				high_pipe_bw), 19200000);
 		else
-			ts_bytes = high_pipe_bw / 19200000;
+			ts_bytes = DIV_ROUND_UP_ULL(high_pipe_bw, 19200000);
 		break;
 	default:
 		pr_err("unknown multirect mode!\n");