Commit 6d8ad161 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/audio-20180703-pull-request' into staging 



audio: hda fixes, timer tracing

# gpg: Signature made Tue 03 Jul 2018 13:10:03 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/audio-20180703-pull-request:
  audio: add audio timer trace points
  audio/hda: fix CID 1393631
  audio/hda: adjust larger gaps faster

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2a018f6e 1a961e78

audio/audio.c

+25 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "sysemu/sysemu.h"

#include "qemu/cutils.h"

#include "sysemu/replay.h"

#include "trace.h"



#define AUDIO_CAP "audio"

#include "audio_int.h"
@@ -1129,6 +1130,10 @@ static void audio_pcm_print_info (const char *cap, struct audio_pcm_info *info) 
/*

 * Timer

 */



static bool audio_timer_running;

static uint64_t audio_timer_last;



static int audio_is_timer_needed (void)

{

    HWVoiceIn *hwi = NULL;
@@ -1148,14 +1153,31 @@ static void audio_reset_timer (AudioState *s) 
    if (audio_is_timer_needed ()) {

        timer_mod_anticipate_ns(s->ts,

            qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + conf.period.ticks);

        if (!audio_timer_running) {

            audio_timer_running = true;

            audio_timer_last = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);

            trace_audio_timer_start(conf.period.ticks / SCALE_MS);

        }

    else {

    } else {

        timer_del(s->ts);

        if (audio_timer_running) {

            audio_timer_running = false;

            trace_audio_timer_stop();

        }

    }

}



static void audio_timer (void *opaque)

{

    int64_t now, diff;



    now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);

    diff = now - audio_timer_last;

    if (diff > conf.period.ticks * 3 / 2) {

        trace_audio_timer_delayed(diff / SCALE_MS);

    }

    audio_timer_last = now;



    audio_run ("timer");

    audio_reset_timer (opaque);

}

audio/trace-events

+5 −0
Original line number Diff line number Diff line
@@ -15,3 +15,8 @@ alsa_no_frames(int state) "No frames available and ALSA state is %d" 
# audio/ossaudio.c

oss_version(int version) "OSS version = 0x%x"

oss_invalid_available_size(int size, int bufsize) "Invalid available size, size=%d bufsize=%d"



# audio/audio.c

audio_timer_start(int interval) "interval %d ms"

audio_timer_stop(void) ""

audio_timer_delayed(int interval) "interval %d ms"

hw/audio/hda-codec.c

+4 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ struct HDAAudioState { 


static inline int64_t hda_bytes_per_second(HDAAudioStream *st)

{

    return 2 * st->as.nchannels * st->as.freq;

    return 2LL * st->as.nchannels * st->as.freq;

}



static inline void hda_timer_sync_adjust(HDAAudioStream *st, int64_t target_pos)
@@ -203,6 +203,9 @@ static inline void hda_timer_sync_adjust(HDAAudioStream *st, int64_t target_pos) 
    if (target_pos < -limit) {

        corr = -HDA_TIMER_TICKS;

    }

    if (target_pos < -(2 * limit)) {

        corr = -(4 * HDA_TIMER_TICKS);

    }

    if (corr == 0) {

        return;

    }