Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92b862c7 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai
Browse files

ALSA: firewire-lib: optimize packet flushing 



Trying to flush completed packets is pointless when the pointer
callback was called from the packet completion callback; avoid it.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e9148ddd

sound/firewire/amdtp.c

+7 −1
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ void amdtp_out_stream_pcm_prepare(struct amdtp_out_stream *s) 
	tasklet_kill(&s->period_tasklet);

	s->pcm_buffer_pointer = 0;

	s->pcm_period_pointer = 0;

	s->pointer_flush = true;

}

EXPORT_SYMBOL(amdtp_out_stream_pcm_prepare);
@@ -393,6 +394,7 @@ static void queue_out_packet(struct amdtp_out_stream *s, unsigned int cycle) 
		s->pcm_period_pointer += data_blocks;

		if (s->pcm_period_pointer >= pcm->runtime->period_size) {

			s->pcm_period_pointer -= pcm->runtime->period_size;

			s->pointer_flush = false;

			tasklet_hi_schedule(&s->period_tasklet);

		}

	}
@@ -539,7 +541,11 @@ EXPORT_SYMBOL(amdtp_out_stream_start); 
 */

unsigned long amdtp_out_stream_pcm_pointer(struct amdtp_out_stream *s)

{

	/* this optimization is allowed to be racy */

	if (s->pointer_flush)

		fw_iso_context_flush_completions(s->context);

	else

		s->pointer_flush = true;



	return ACCESS_ONCE(s->pcm_buffer_pointer);

}

sound/firewire/amdtp.h

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ struct amdtp_out_stream { 


	unsigned int pcm_buffer_pointer;

	unsigned int pcm_period_pointer;

	bool pointer_flush;

};



int amdtp_out_stream_init(struct amdtp_out_stream *s, struct fw_unit *unit,