Commit 43db4a59 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Reenable tracepoints for controller

After correcting the fields to point the right members, tracepoints
can be reenabled again for the legacy controller code.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 5f26face
...@@ -31,6 +31,9 @@ ...@@ -31,6 +31,9 @@
#include <sound/initval.h> #include <sound/initval.h>
#include "hda_controller.h" #include "hda_controller.h"
#define CREATE_TRACE_POINTS
#include "hda_intel_trace.h"
/* DSP lock helpers */ /* DSP lock helpers */
#define dsp_lock(dev) snd_hdac_dsp_lock(azx_stream(dev)) #define dsp_lock(dev) snd_hdac_dsp_lock(azx_stream(dev))
#define dsp_unlock(dev) snd_hdac_dsp_unlock(azx_stream(dev)) #define dsp_unlock(dev) snd_hdac_dsp_unlock(azx_stream(dev))
...@@ -229,6 +232,8 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) ...@@ -229,6 +232,8 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
int sync_reg; int sync_reg;
azx_dev = get_azx_dev(substream); azx_dev = get_azx_dev(substream);
trace_azx_pcm_trigger(chip, azx_dev, cmd);
hstr = azx_stream(azx_dev); hstr = azx_stream(azx_dev);
if (chip->driver_caps & AZX_DCAPS_OLD_SSYNC) if (chip->driver_caps & AZX_DCAPS_OLD_SSYNC)
sync_reg = AZX_REG_OLD_SSYNC; sync_reg = AZX_REG_OLD_SSYNC;
...@@ -330,6 +335,7 @@ unsigned int azx_get_position(struct azx *chip, ...@@ -330,6 +335,7 @@ unsigned int azx_get_position(struct azx *chip,
substream->runtime->delay = delay; substream->runtime->delay = delay;
} }
trace_azx_get_position(chip, azx_dev, pos, delay);
return pos; return pos;
} }
EXPORT_SYMBOL_GPL(azx_get_position); EXPORT_SYMBOL_GPL(azx_get_position);
......
...@@ -24,7 +24,7 @@ TRACE_EVENT(azx_pcm_trigger, ...@@ -24,7 +24,7 @@ TRACE_EVENT(azx_pcm_trigger,
TP_fast_assign( TP_fast_assign(
__entry->card = (chip)->card->number; __entry->card = (chip)->card->number;
__entry->idx = (dev)->index; __entry->idx = (dev)->core.index;
__entry->cmd = cmd; __entry->cmd = cmd;
), ),
...@@ -46,7 +46,7 @@ TRACE_EVENT(azx_get_position, ...@@ -46,7 +46,7 @@ TRACE_EVENT(azx_get_position,
TP_fast_assign( TP_fast_assign(
__entry->card = (chip)->card->number; __entry->card = (chip)->card->number;
__entry->idx = (dev)->index; __entry->idx = (dev)->core.index;
__entry->pos = pos; __entry->pos = pos;
__entry->delay = delay; __entry->delay = delay;
), ),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment