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

@@ -567,8 +567,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;
 
@@ -593,6 +595,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 colums should exclude
+			 * the BPT columns
+			 */
+			if (m_rt->stream->state >= SDW_STREAM_PREPARED)
+				s_bpt_running = true;
 		}
 	}
 
@@ -615,7 +623,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;