Skip to content

Commit

Permalink
ALSA: hda - add hda_intel_trace.h
Browse files Browse the repository at this point in the history
This patch creates hda_intel_trace.h to add some pm trace functions
used in hda_intel.c

Signed-off-by: Libin Yang <libin.yang@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Libin Yang authored and Takashi Iwai committed May 18, 2015
1 parent 1848650 commit 785d8c4
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 0 deletions.
1 change: 1 addition & 0 deletions sound/pci/hda/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o

# for trace-points
CFLAGS_hda_controller.o := -I$(src)
CFLAGS_hda_intel.o := -I$(src)

snd-hda-codec-generic-objs := hda_generic.o
snd-hda-codec-realtek-objs := patch_realtek.o
Expand Down
9 changes: 9 additions & 0 deletions sound/pci/hda/hda_intel.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@
#include "hda_controller.h"
#include "hda_intel.h"

#define CREATE_TRACE_POINTS
#include "hda_intel_trace.h"

/* position fix mode */
enum {
POS_FIX_AUTO,
Expand Down Expand Up @@ -831,6 +834,8 @@ static int azx_suspend(struct device *dev)
if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL
&& hda->need_i915_power)
hda_display_power(hda, false);

trace_azx_suspend(chip);
return 0;
}

Expand Down Expand Up @@ -864,6 +869,8 @@ static int azx_resume(struct device *dev)
hda_intel_init_chip(chip, true);

snd_power_change_state(card, SNDRV_CTL_POWER_D0);

trace_azx_resume(chip);
return 0;
}
#endif /* CONFIG_PM_SLEEP || SUPPORT_VGA_SWITCHEROO */
Expand Down Expand Up @@ -897,6 +904,7 @@ static int azx_runtime_suspend(struct device *dev)
&& hda->need_i915_power)
hda_display_power(hda, false);

trace_azx_runtime_suspend(chip);
return 0;
}

Expand Down Expand Up @@ -945,6 +953,7 @@ static int azx_runtime_resume(struct device *dev)
azx_writew(chip, WAKEEN, azx_readw(chip, WAKEEN) &
~STATESTS_INT_MASK);

trace_azx_runtime_resume(chip);
return 0;
}

Expand Down
53 changes: 53 additions & 0 deletions sound/pci/hda/hda_intel_trace.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
#undef TRACE_SYSTEM
#define TRACE_SYSTEM hda_intel
#define TRACE_INCLUDE_FILE hda_intel_trace

#if !defined(_TRACE_HDA_INTEL_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_HDA_INTEL_H

#include <linux/tracepoint.h>

DECLARE_EVENT_CLASS(hda_pm,
TP_PROTO(struct azx *chip),

TP_ARGS(chip),

TP_STRUCT__entry(
__field(int, dev_index)
),

TP_fast_assign(
__entry->dev_index = (chip)->dev_index;
),

TP_printk("card index: %d", __entry->dev_index)
);

DEFINE_EVENT(hda_pm, azx_suspend,
TP_PROTO(struct azx *chip),
TP_ARGS(chip)
);

DEFINE_EVENT(hda_pm, azx_resume,
TP_PROTO(struct azx *chip),
TP_ARGS(chip)
);

#ifdef CONFIG_PM
DEFINE_EVENT(hda_pm, azx_runtime_suspend,
TP_PROTO(struct azx *chip),
TP_ARGS(chip)
);

DEFINE_EVENT(hda_pm, azx_runtime_resume,
TP_PROTO(struct azx *chip),
TP_ARGS(chip)
);
#endif

#endif /* _TRACE_HDA_INTEL_H */

/* This part must be outside protection */
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#include <trace/define_trace.h>

0 comments on commit 785d8c4

Please sign in to comment.