On 8/2/21 2:27 PM, Sasha Levin wrote:
> On Mon, Aug 02, 2021 at 01:06:14PM -0500, Pierre-Louis Bossart wrote:
>> From: Rander Wang <rander.wang@xxxxxxxxx>
>>
>> commit 33c8516841ea4fa12fdb8961711bf95095c607ee upstream
>>
>> On TGL platform with max98373 codec the trigger start sequence is
>> fe first, then codec component and sdw link is the last. Recently
>> a delay was introduced in max98373 codec driver and this resulted
>> to the start of sdw stream transmission was delayed and the data
>> transmitted by fw can't be consumed by sdw controller, so xrun happened.
>>
>> Adding delay in trigger function is a bad idea. This patch enable spk
>> pin in prepare function and disable it in hw_free to avoid xrun issue
>> caused by delay in trigger.
>>
>> Fixes: 3a27875e91fb ("ASoC: max98373: Added 30ms turn on/off time delay")
>> BugLink: https://github.com/thesofproject/sof/issues/4066
>> Reviewed-by: Bard Liao <bard.liao@xxxxxxxxx>
>> Reviewed-by: Péter Ujfalusi <peter.ujfalusi@xxxxxxxxxxxxxxx>
>> Signed-off-by: Rander Wang <rander.wang@xxxxxxxxx>
>> Signed-off-by: Pierre-Louis Bossart
>> <pierre-louis.bossart@xxxxxxxxxxxxxxx>
>> Link:
>> https://lore.kernel.org/r/20210625205042.65181-2-pierre-louis.bossart@xxxxxxxxxxxxxxx
>>
>> Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
>> ---
>>
>> backport to stable/linux-5.13.y and stable/linux-5.12.y since upstream
>> commit does not apply directly due to a rename in 9c5046e4b3e7 which
>> creates a conflict.
>
> Any objections to bringing in:
>
> 9c5046e4b3e7 ("ASoC: Intel: boards: create sof-maxim-common module")
> f6081af6cf2b ("ASoC: Intel: boards: handle hda-dsp-common as a module")
>
> to 5.13 instead? This way we'll be better aligned with upstream and
> avoid this type of failures in the future.
Thanks for the suggestion Sasha, it'd certainly be easier for us and
distros/end-users if such renames/repartition patches could land in -stable.
We have e.g. another recent case we de-duplicated a set of
jack-detection enums in "ASoC: Intel: sof_sdw: include rt711.h for RT711
JD mode" and as a result the addition of newer quirks for Dell or NUC
devices won't apply cleanly on the stable branch.
