lkml.org 
[lkml]   [2023]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 6.1 21/41] ASoC: SOF: Intel: fix SoundWire/HDaudio mutual exclusion
    Date
    From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

    [ Upstream commit f751b99255cacd9ffe8c4bbf99767ad670cee1f7 ]

    The functionality described in Commit 61bef9e68dca ("ASoC: SOF: Intel: hda: enforce exclusion between HDaudio and SoundWire")
    does not seem to be properly implemented with two issues that need to
    be corrected.

    a) The test used is incorrect when DisplayAudio codecs are not supported.

    b) Conversely when only Display Audio codecs can be found, we do want
    to start the SoundWire links, if any. That will help add the relevant
    topologies and machine descriptors, and identify cases where the
    SoundWire information in ACPI needs to be modified with a quirk.

    Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
    Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
    Link: https://lore.kernel.org/r/20230606222529.57156-2-pierre-louis.bossart@linux.intel.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/sof/intel/hda.c | 12 +++++++++++-
    1 file changed, 11 insertions(+), 1 deletion(-)

    diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
    index 1188ec51816bd..63764afdcf617 100644
    --- a/sound/soc/sof/intel/hda.c
    +++ b/sound/soc/sof/intel/hda.c
    @@ -1309,12 +1309,22 @@ static void hda_generic_machine_select(struct snd_sof_dev *sdev,
    hda_mach->mach_params.dmic_num = dmic_num;
    pdata->tplg_filename = tplg_filename;

    - if (codec_num == 2) {
    + if (codec_num == 2 ||
    + (codec_num == 1 && !HDA_IDISP_CODEC(bus->codec_mask))) {
    /*
    * Prevent SoundWire links from starting when an external
    * HDaudio codec is used
    */
    hda_mach->mach_params.link_mask = 0;
    + } else {
    + /*
    + * Allow SoundWire links to start when no external HDaudio codec
    + * was detected. This will not create a SoundWire card but
    + * will help detect if any SoundWire codec reports as ATTACHED.
    + */
    + struct sof_intel_hda_dev *hdev = sdev->pdata->hw_pdata;
    +
    + hda_mach->mach_params.link_mask = hdev->info.link_mask;
    }

    *mach = hda_mach;
    --
    2.39.2
    \
     
     \ /
      Last update: 2023-07-24 03:24    [W:3.301 / U:1.444 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site