ASoC: SOF: ipc4-topology: Improve playback dai copier in/out format selection #5396
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2175,28 +2175,32 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, | |
| copier_data = &ipc4_copier->data; | ||
| available_fmt = &ipc4_copier->available_fmt; | ||
|
|
||
| if (dir == SNDRV_PCM_STREAM_PLAYBACK) { | ||
| /* | ||
| * For playback the pipeline_params needs to be used to | ||
| * find the input configuration of the copier. | ||
| */ | ||
| ref_params = kmemdup(pipeline_params, sizeof(*ref_params), | ||
| GFP_KERNEL); | ||
|
lgirdwood marked this conversation as resolved.
Outdated
|
||
| if (!ref_params) | ||
| return -ENOMEM; | ||
| } else { | ||
| /* | ||
| * For capture the adjusted fe_params needs to be used | ||
| * to find the input configuration of the copier. | ||
| * | ||
| * The params might be updated in | ||
| * sof_ipc4_prepare_dai_copier() to reflect the supported | ||
| * input formats by the copier/dai. | ||
| */ | ||
| ref_params = kmemdup(fe_params, sizeof(*ref_params), GFP_KERNEL); | ||
| if (!ref_params) | ||
| return -ENOMEM; | ||
|
|
||
| ret = sof_ipc4_prepare_dai_copier(sdev, dai, ref_params, dir); | ||
| if (ret < 0) | ||
|
Collaborator
There was a problem hiding this comment. @ujfalusi do we have a memory leak for the cllocated memory for ref_params here and possibly all error paths below?
Collaborator
Author
There was a problem hiding this comment. No, we don't because of: struct snd_pcm_hw_params *ref_params __free(kfree) = NULL;it will be freed on function exit. |
||
| return ret; | ||
| } | ||
|
|
||
| break; | ||
| } | ||
|
|
@@ -2251,15 +2255,33 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, | |
| } | ||
| case snd_soc_dapm_aif_out: | ||
| case snd_soc_dapm_dai_in: | ||
| /* | ||
| * For capture the fe_params needs to be used to find the output | ||
| * configuration of the copier. | ||
| * | ||
| * For playback the adjusted fe_params needs to be used | ||
| * to find the output configuration of the copier. | ||
| * | ||
| * The params might be updated in | ||
| * sof_ipc4_prepare_dai_copier() to reflect the supported | ||
| * output formats by the copier/dai. | ||
| */ | ||
| memcpy(ref_params, fe_params, sizeof(*ref_params)); | ||
| if (dir == SNDRV_PCM_STREAM_PLAYBACK) { | ||
| ret = sof_ipc4_prepare_dai_copier(sdev, dai, ref_params, dir); | ||
| if (ret < 0) | ||
| return ret; | ||
| } | ||
|
|
||
| out_ref_rate = params_rate(ref_params); | ||
| out_ref_channels = params_channels(ref_params); | ||
| ret = sof_ipc4_get_sample_type(sdev, ref_params); | ||
| if (ret < 0) | ||
| return ret; | ||
| out_ref_type = (u32)ret; | ||
|
|
||
| if (!single_output_bitdepth) { | ||
| out_ref_valid_bits = sof_ipc4_get_valid_bits(sdev, ref_params); | ||
| if (out_ref_valid_bits < 0) | ||
| return out_ref_valid_bits; | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The commit message "When using a nocodec passthrough topology (which is a bug) " is a bit confusing. What is the bug here, the fact we are using nocodec passthrough topology? Not sure what is the bug. It seems legal to only provide S32 blobs and a copier configuration that supports at least S32.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, I will drop the note. I added it after a long internal discussion that using the nocodec passthrough is really something which is not to be used, it is even more experimental than nocodec and it has been not tested at all (I happened to needed it for testing something else)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ujfalusi Right but kernel shouldn't care if some topology should be used or not. The topology is either correct (and it should work), or it's not and kernel should return an error. I guess this falls a bit in the grey are and poses the question should kernel try to cope with "almost correct" topology. But based on your description, this topology actually seems correct.