soundwire: subtract BPT columns in bandwidth calculation

When a BPT stream is running, we should subtract the columns that is
used by the BPT stream in bandwidth calculation.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

Author: bardliao

drivers/soundwire/generic_bandwidth_allocation.c

@@ -267,8 +267,16 @@ static int sdw_compute_group_params(struct sdw_bus *bus,
 			 */
 			if (m_rt->stream->state != SDW_STREAM_ENABLED &&
 			    m_rt->stream->state != SDW_STREAM_PREPARED &&
-			    m_rt->stream->state != SDW_STREAM_DISABLED)
+			    m_rt->stream->state != SDW_STREAM_DISABLED) {
 				continue;
+			} else if (m_rt->stream->type == SDW_STREAM_BPT) {
+				/*
+				 * If any BPT stream is running, exclude the BPT columns
+				 * BPT: col 0.. bus->bpt_hstop
+				 * Audio: col bus->bpt_hstop + 1 .. bus->params.col - 1
+				 */
+				sel_col = bus->params.col - bus->bpt_hstop - 1;
+			}
 		}
 
 		/* Don't count BPT stream bandwidth, it will use the remaining bandwidth */
@@ -303,8 +311,12 @@ static int sdw_compute_group_params(struct sdw_bus *bus,
 			/* There is no control column for lane 1 and above */
 			if (column_needed > sel_col)
 				return -EINVAL;
-			/* Column 0 is control column on lane 0 */
-			if (params[i].lane == 0 && column_needed > sel_col - 1)
+			/*
+			 * Column 0 is control column on lane 0, but sel_col is already excludes
+			 * column 0 when it is less than bus->params.col.
+			 */
+			if (sel_col < bus->params.col && params[i].lane == 0 &&
+			    column_needed > sel_col - 1)
 				return -EINVAL;
 		}
 	}
@@ -570,8 +582,10 @@ static int sdw_compute_bus_params(struct sdw_bus *bus)
 	struct sdw_master_runtime *m_rt;
 	struct sdw_slave_runtime *s_rt;
 	unsigned int curr_dr_freq = 0;
+	bool is_bpt_running = false;
 	int i, l, clk_values, ret;
 	bool is_gear = false;
+	int available_col;
 	int m_lane = 0;
 	u32 *clk_buf;
 
@@ -596,6 +610,12 @@ static int sdw_compute_bus_params(struct sdw_bus *bus)
 		    m_rt->stream->state < SDW_STREAM_DEPREPARED) {
 			clk_values = 1;
 			clk_buf = NULL;
+			/*
+			 * If any BPT stream is active, the available audio columns should exclude
+			 * the BPT columns
+			 */
+			if (m_rt->stream->state >= SDW_STREAM_PREPARED)
+				is_bpt_running = true;
 		}
 	}
 
@@ -618,7 +638,21 @@ static int sdw_compute_bus_params(struct sdw_bus *bus)
 
 		total_col = curr_dr_freq / mstr_prop->default_frame_rate / mstr_prop->default_row;
 
-		if (curr_dr_freq * (total_col - 1) >=
+		/*
+		 * available columns for audio stream on lane 0:
+		 * - exclude control column 0
+		 * - if BPT is active, also exclude columns 1..bpt_hstop used by DP0
+		 */
+		if (is_bpt_running)
+			available_col = total_col - bus->bpt_hstop - 1;
+		else
+			available_col = total_col - 1;
+
+		if (available_col <= 0)
+			continue;
+
+		/* Keep formula consistent with sdw_select_row_col() */
+		if (curr_dr_freq * available_col >=
 		    bus->params.bandwidth * total_col)
 			break;