Skip to content

Fix fw_filename and tplg_filename override - #3740

Merged
plbossart merged 2 commits into
thesofproject:topic/sof-devfrom
plbossart:fix/hda-override
Jul 15, 2022
Merged

plbossart merged 2 commits into
thesofproject:topic/sof-devfrom
plbossart:fix/hda-override

Conversation

@plbossart

Copy link
Copy Markdown
Member

Somehow we've added features that get in the way of a top-level override with kernel parameters or DMI quirks.

This will be helpful to solve the PDM1 issue and e.g. use

options snd-sof-pci tplg_filename=sof-hda-generic-2ch-pdm1.tplg

Comment thread sound/soc/sof/intel/hda.c Outdated
ranj063
ranj063 previously approved these changes Jul 6, 2022
aiChaoSONG
aiChaoSONG previously approved these changes Jul 7, 2022

@aiChaoSONG aiChaoSONG left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

if dmic_topology_fixup is called with fixup==false, this means we called a function named ...fixup... but actually it fixup nothing, this looks unfamiliar to me.
I am more comfortable with the on demand calling to dmic_topology_fixup, but we lose dev_info(sdev->dev, "DMICs detected in NHLT tables: %d\n", dmic_num); information if tplg_name desn't need fixup.

I don't have better idea, so approve

@plbossart

Copy link
Copy Markdown
Member Author

if dmic_topology_fixup is called with fixup==false, this means we called a function named ...fixup... but actually it fixup nothing, this looks unfamiliar to me. I am more comfortable with the on demand calling to dmic_topology_fixup, but we lose dev_info(sdev->dev, "DMICs detected in NHLT tables: %d\n", dmic_num); information if tplg_name desn't need fixup.

I don't have better idea, so approve

Actually no we don't lose the dev_info message. I renamed the function dmic_detect_topology_fixup() with the second part optional and gated by a parameter value. Hope this helps.

@plbossart
plbossart dismissed stale reviews from aiChaoSONG and ranj063 via b45fadb July 7, 2022 16:06
@plbossart

Copy link
Copy Markdown
Member Author

This will need to be rebased and merged after #3730 is in topic/sof-dev. There's a conflict with the dmic handling.

ranj063
ranj063 previously approved these changes Jul 7, 2022
aiChaoSONG
aiChaoSONG previously approved these changes Jul 11, 2022
The fw_filename is now set at a higher level and can be overridden by
kernel parameters or DMI quirks.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
We do all kinds of renaming tricks that get in the way of kernel
parameter and DMI quirk overrides at a higher level.

Tested on UpExtreme board with

options snd-sof-pci tplg_filename=sof-hda-generic.tplg

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
@plbossart
plbossart dismissed stale reviews from aiChaoSONG and ranj063 via 4f5c018 July 12, 2022 19:55
@plbossart
plbossart marked this pull request as ready for review July 12, 2022 19:55
Comment thread sound/soc/sof/intel/hda.c
@plbossart
plbossart merged commit a8c5813 into thesofproject:topic/sof-dev Jul 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants