aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2015-08-19 04:48:57 -0400
committerTakashi Iwai <tiwai@suse.de>2015-09-02 06:23:55 -0400
commit45c053df5bdc4843cf19b920db6ab819ddc27ff7 (patch)
tree3eed70f87f158814dcc60d645c175833240a0fa8 /include
parent51e1d83cab9988716ae68801a721f4df0aaa374b (diff)
ALSA: hda - allow codecs to access the i915 pin/ELD callback
This lets the interested codec be notified when an i915 pin/ELD event happens. [tiwai: Fixed a trivial build error for CONFIG_SND_HDA_I915=n] Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include')
-rw-r--r--include/sound/hda_i915.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/sound/hda_i915.h b/include/sound/hda_i915.h
index adb5ba5cbd9d..a5b5cae03e87 100644
--- a/include/sound/hda_i915.h
+++ b/include/sound/hda_i915.h
@@ -4,12 +4,15 @@
4#ifndef __SOUND_HDA_I915_H 4#ifndef __SOUND_HDA_I915_H
5#define __SOUND_HDA_I915_H 5#define __SOUND_HDA_I915_H
6 6
7#include <drm/i915_component.h>
8
7#ifdef CONFIG_SND_HDA_I915 9#ifdef CONFIG_SND_HDA_I915
8int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable); 10int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable);
9int snd_hdac_display_power(struct hdac_bus *bus, bool enable); 11int snd_hdac_display_power(struct hdac_bus *bus, bool enable);
10int snd_hdac_get_display_clk(struct hdac_bus *bus); 12int snd_hdac_get_display_clk(struct hdac_bus *bus);
11int snd_hdac_i915_init(struct hdac_bus *bus); 13int snd_hdac_i915_init(struct hdac_bus *bus);
12int snd_hdac_i915_exit(struct hdac_bus *bus); 14int snd_hdac_i915_exit(struct hdac_bus *bus);
15int snd_hdac_i915_register_notifier(const struct i915_audio_component_audio_ops *);
13#else 16#else
14static int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable) 17static int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable)
15{ 18{
@@ -31,6 +34,10 @@ static inline int snd_hdac_i915_exit(struct hdac_bus *bus)
31{ 34{
32 return 0; 35 return 0;
33} 36}
37static inline int snd_hdac_i915_register_notifier(const struct i915_audio_component_audio_ops *ops)
38{
39 return -ENODEV;
40}
34#endif 41#endif
35 42
36#endif /* __SOUND_HDA_I915_H */ 43#endif /* __SOUND_HDA_I915_H */