Skip to content

Commit d341681

Browse files
committed
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>
1 parent 43382d2 commit d341681

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
@@ -2298,8 +2298,19 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
22982298
ch_map >>= 4;
22992299
}
23002300

2301-
step = ch_count / blob->alh_cfg.device_count;
2302-
mask = GENMASK(step - 1, 0);
2301+
if (swidget->id == snd_soc_dapm_dai_in && ch_count == out_ref_channels) {
2302+
/*
2303+
* For playback DAI widgets where the channel number is equal to
2304+
* the output reference channels, set the step = 0 to ensure all
2305+
* the ch_mask is applied to all alh mappings.
2306+
*/
2307+
mask = ch_mask;
2308+
step = 0;
2309+
} else {
2310+
step = ch_count / blob->alh_cfg.device_count;
2311+
mask = GENMASK(step - 1, 0);
2312+
}
2313+
23032314
/*
23042315
* Set each gtw_cfg.node_id to blob->alh_cfg.mapping[]
23052316
* for all widgets with the same stream name
@@ -2334,8 +2345,9 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
23342345
}
23352346

23362347
/*
2337-
* Set the same channel mask for playback as the audio data is
2338-
* duplicated for all speakers. For capture, split the channels
2348+
* Set the same channel mask if the widget channel count is the same
2349+
* as the FE channels for playback as the audio data is duplicated
2350+
* for all speakers in this case. Otherwise, split the channels
23392351
* among the aggregated DAIs. For example, with 4 channels on 2
23402352
* aggregated DAIs, the channel_mask should be 0x3 and 0xc for the
23412353
* two DAI's.
@@ -2344,10 +2356,7 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
23442356
* the tables in soc_acpi files depending on the _ADR and devID
23452357
* registers for each codec.
23462358
*/
2347-
if (w->id == snd_soc_dapm_dai_in)
2348-
blob->alh_cfg.mapping[i].channel_mask = ch_mask;
2349-
else
2350-
blob->alh_cfg.mapping[i].channel_mask = mask << (step * i);
2359+
blob->alh_cfg.mapping[i].channel_mask = mask << (step * i);
23512360

23522361
i++;
23532362
}

0 commit comments

Comments
 (0)