Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: hda: fix trigger_tstamp_latched

Browse Source 
When the trigger_tstamp_latched flag is set, the PCM core code assumes that
the low-level driver handles the trigger timestamping itself. Ensure that
runtime->trigger_tstamp is always updated.

Buglink: https://github.com/alsa-project/alsa-lib/issues/387
Reported-by: Zeno Endemann <zeno.endemann@mailbox.org>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Link: https://patch.msgid.link/20241002081306.1788405-1-perex@perex.cz
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Jaroslav Kysela 2024-10-02 10:13:06 +02:00 committed by Takashi Iwai
parent d75dba4974
commit df5215618f
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sound/hdaudio.h
View File

@ -590,7 +590,7 @@ void snd_hdac_stream_sync_trigger(struct hdac_stream *azx_dev, bool set,
void snd_hdac_stream_sync(struct hdac_stream *azx_dev, bool start, void snd_hdac_stream_sync(struct hdac_stream *azx_dev, bool start,
unsigned int streams); unsigned int streams);
void snd_hdac_stream_timecounter_init(struct hdac_stream *azx_dev, void snd_hdac_stream_timecounter_init(struct hdac_stream *azx_dev,
unsigned int streams); unsigned int streams, bool start);
int snd_hdac_get_stream_stripe_ctl(struct hdac_bus *bus, int snd_hdac_get_stream_stripe_ctl(struct hdac_bus *bus,
struct snd_pcm_substream *substream); struct snd_pcm_substream *substream);

6
sound/hda/hdac_stream.c
View File

@ -664,7 +664,7 @@ static void azx_timecounter_init(struct hdac_stream *azx_dev,
* updated accordingly, too. * updated accordingly, too.
*/ */
void snd_hdac_stream_timecounter_init(struct hdac_stream *azx_dev, void snd_hdac_stream_timecounter_init(struct hdac_stream *azx_dev,
unsigned int streams) unsigned int streams, bool start)
{ {
struct hdac_bus *bus = azx_dev->bus; struct hdac_bus *bus = azx_dev->bus;
struct snd_pcm_runtime *runtime = azx_dev->substream->runtime; struct snd_pcm_runtime *runtime = azx_dev->substream->runtime;
@ -672,6 +672,9 @@ void snd_hdac_stream_timecounter_init(struct hdac_stream *azx_dev,
bool inited = false; bool inited = false;
u64 cycle_last = 0; u64 cycle_last = 0;
if (!start)
goto skip;
list_for_each_entry(s, &bus->stream_list, list) { list_for_each_entry(s, &bus->stream_list, list) {
if ((streams & (1 << s->index))) { if ((streams & (1 << s->index))) {
azx_timecounter_init(s, inited, cycle_last); azx_timecounter_init(s, inited, cycle_last);
@ -682,6 +685,7 @@ void snd_hdac_stream_timecounter_init(struct hdac_stream *azx_dev,
} }
} }
skip:
snd_pcm_gettime(runtime, &runtime->trigger_tstamp); snd_pcm_gettime(runtime, &runtime->trigger_tstamp);
runtime->trigger_tstamp_latched = true; runtime->trigger_tstamp_latched = true;
} }

3
sound/pci/hda/hda_controller.c
View File

@ -275,8 +275,7 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
spin_lock(&bus->reg_lock); spin_lock(&bus->reg_lock);
/* reset SYNC bits */ /* reset SYNC bits */
snd_hdac_stream_sync_trigger(hstr, false, sbits, sync_reg); snd_hdac_stream_sync_trigger(hstr, false, sbits, sync_reg);
if (start) snd_hdac_stream_timecounter_init(hstr, sbits, start);
snd_hdac_stream_timecounter_init(hstr, sbits);
spin_unlock(&bus->reg_lock); spin_unlock(&bus->reg_lock);
return 0; return 0;
} }