Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/sound/sof.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ struct sof_dev_desc {

bool use_acpi_target_states;

/*set to 1 to not use ignore_machine and still keep the normal platform driver*/
bool sof_keep_normal_fes;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As this is already "sof_dev_desc", the "sof_" prefix is not needed. Also "normal" is a bit problematic, it depends on the case what is normal, so this can lead to confusion later on. Maybe "fixed_fe_link_config"?


/* Platform resource indexes in BAR / ACPI resources. */
/* Must set to -1 if not used - add new items to end */
int resindex_lpe_base;
Expand Down
3 changes: 2 additions & 1 deletion sound/soc/sof/pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,8 @@ void snd_sof_new_platform_drv(struct snd_sof_dev *sdev)
pd->compress_ops = &sof_probe_compressed_ops;
#endif
pd->pcm_construct = sof_pcm_new;
pd->ignore_machine = drv_name;
if (!plat_data->desc->sof_keep_normal_fes)
pd->ignore_machine = drv_name;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if the situation is that you have an sof plaform driver and a 'normal' platform driver then presumably they register two separate ASoC components.

So it's not clear to me why we would add in the SOF driver something that relates to the other component. There should be something in the card creation that ignores FEs when the component of that FE needs to be overridden.

In other words, the ignore_machine should be a component property, not a card property.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with @plbossart. Are you suggesting that the 2 platforms drivers are used concurrently? If that is the case, shouldnt the SOF platform driver always ignore the FE's that are associated with the audio paths on the AP?

pd->be_hw_params_fixup = sof_pcm_dai_link_fixup;
pd->be_pcm_base = SOF_BE_PCM_BASE;
pd->use_dai_pcm_id = true;
Expand Down