Skip to content

Commit da230e2

Browse files
bardliaobroonie
authored andcommitted
ASoC: SOF: ipc4-topology: set playback channel mask
Currently, we send all channels to all amps and copy the channel_mask to all ALH DMAs in playback. However, the amp may not have the capability to run any process and SOF may need to split the channels and send specific data channel to each amp. In that case, we need to split the channel_mask in ALH DMA. Copy the channel mask only if the widget channel count is the same the FE channels for playback, otherwise, split the channels among the aggregated DAIs. Like what we did in capture. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Link: https://patch.msgid.link/20251215130723.31081-1-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 8408513 commit da230e2

1 file changed

Lines changed: 17 additions & 8 deletions

File tree

sound/soc/sof/ipc4-topology.c

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2280,8 +2280,19 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
22802280
ch_map >>= 4;
22812281
}
22822282

2283-
step = ch_count / blob->alh_cfg.device_count;
2284-
mask = GENMASK(step - 1, 0);
2283+
if (swidget->id == snd_soc_dapm_dai_in && ch_count == out_ref_channels) {
2284+
/*
2285+
* For playback DAI widgets where the channel number is equal to
2286+
* the output reference channels, set the step = 0 to ensure all
2287+
* the ch_mask is applied to all alh mappings.
2288+
*/
2289+
mask = ch_mask;
2290+
step = 0;
2291+
} else {
2292+
step = ch_count / blob->alh_cfg.device_count;
2293+
mask = GENMASK(step - 1, 0);
2294+
}
2295+
22852296
/*
22862297
* Set each gtw_cfg.node_id to blob->alh_cfg.mapping[]
22872298
* for all widgets with the same stream name
@@ -2316,8 +2327,9 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
23162327
}
23172328

23182329
/*
2319-
* Set the same channel mask for playback as the audio data is
2320-
* duplicated for all speakers. For capture, split the channels
2330+
* Set the same channel mask if the widget channel count is the same
2331+
* as the FE channels for playback as the audio data is duplicated
2332+
* for all speakers in this case. Otherwise, split the channels
23212333
* among the aggregated DAIs. For example, with 4 channels on 2
23222334
* aggregated DAIs, the channel_mask should be 0x3 and 0xc for the
23232335
* two DAI's.
@@ -2326,10 +2338,7 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
23262338
* the tables in soc_acpi files depending on the _ADR and devID
23272339
* registers for each codec.
23282340
*/
2329-
if (w->id == snd_soc_dapm_dai_in)
2330-
blob->alh_cfg.mapping[i].channel_mask = ch_mask;
2331-
else
2332-
blob->alh_cfg.mapping[i].channel_mask = mask << (step * i);
2341+
blob->alh_cfg.mapping[i].channel_mask = mask << (step * i);
23332342

23342343
i++;
23352344
}

0 commit comments

Comments
 (0)