| Message ID | 038add0bdca1f979cc7abcce8f24cbcd3544084b.1702596646.git.soyer@irl.hu |
|---|---|
| State | Accepted |
| Commit | ec1de5c214eb5a892fdb7c450748249d5e2840f5 |
| Headers | show |
| Series | ALSA: hda/tas2781: select program 0, conf 0 by default | expand |
On Fri, 15 Dec 2023 00:33:27 +0100, Gergo Koteles wrote: > > Currently, cur_prog/cur_conf remains at the default value (-1), while > program 0 has been loaded into the amplifiers. > > In the playback hook, tasdevice_tuning_switch tries to restore the > cur_prog/cur_conf. In the runtime_resume/system_resume, > tasdevice_prmg_load tries to load the cur_prog as well. > > Set cur_prog and cur_conf to 0 if available in the firmware. > > Fixes: 5be27f1e3ec9 ("ALSA: hda/tas2781: Add tas2781 HDA driver") > CC: stable@vger.kernel.org > Signed-off-by: Gergo Koteles <soyer@irl.hu> Thanks, applied now. Takashi
diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c index fb802802939e..e974510367e3 100644 --- a/sound/pci/hda/tas2781_hda_i2c.c +++ b/sound/pci/hda/tas2781_hda_i2c.c @@ -543,6 +543,10 @@ static void tasdev_fw_ready(const struct firmware *fmw, void *context) tas_priv->fw_state = TASDEVICE_DSP_FW_ALL_OK; tasdevice_prmg_load(tas_priv, 0); + if (tas_priv->fmw->nr_programs > 0) + tas_priv->cur_prog = 0; + if (tas_priv->fmw->nr_configurations > 0) + tas_priv->cur_conf = 0; /* If calibrated data occurs error, dsp will still works with default * calibrated data inside algo.
Currently, cur_prog/cur_conf remains at the default value (-1), while program 0 has been loaded into the amplifiers. In the playback hook, tasdevice_tuning_switch tries to restore the cur_prog/cur_conf. In the runtime_resume/system_resume, tasdevice_prmg_load tries to load the cur_prog as well. Set cur_prog and cur_conf to 0 if available in the firmware. Fixes: 5be27f1e3ec9 ("ALSA: hda/tas2781: Add tas2781 HDA driver") CC: stable@vger.kernel.org Signed-off-by: Gergo Koteles <soyer@irl.hu> --- sound/pci/hda/tas2781_hda_i2c.c | 4 ++++ 1 file changed, 4 insertions(+) base-commit: ffc253263a1375a65fa6c9f62a893e9767fbebfa