.. | .. |
---|
5 | 5 | #define __SOUND_HDA_COMPONENT_H |
---|
6 | 6 | |
---|
7 | 7 | #include <drm/drm_audio_component.h> |
---|
| 8 | +#include <sound/hdaudio.h> |
---|
| 9 | + |
---|
| 10 | +/* virtual idx for controller */ |
---|
| 11 | +#define HDA_CODEC_IDX_CONTROLLER HDA_MAX_CODECS |
---|
8 | 12 | |
---|
9 | 13 | #ifdef CONFIG_SND_HDA_COMPONENT |
---|
10 | 14 | int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable); |
---|
11 | | -int snd_hdac_display_power(struct hdac_bus *bus, bool enable); |
---|
| 15 | +void snd_hdac_display_power(struct hdac_bus *bus, unsigned int idx, |
---|
| 16 | + bool enable); |
---|
12 | 17 | int snd_hdac_sync_audio_rate(struct hdac_device *codec, hda_nid_t nid, |
---|
13 | 18 | int dev_id, int rate); |
---|
14 | 19 | int snd_hdac_acomp_get_eld(struct hdac_device *codec, hda_nid_t nid, int dev_id, |
---|
15 | 20 | bool *audio_enabled, char *buffer, int max_bytes); |
---|
16 | 21 | int snd_hdac_acomp_init(struct hdac_bus *bus, |
---|
17 | 22 | const struct drm_audio_component_audio_ops *aops, |
---|
18 | | - int (*match_master)(struct device *, void *), |
---|
| 23 | + int (*match_master)(struct device *, int, void *), |
---|
19 | 24 | size_t extra_size); |
---|
20 | 25 | int snd_hdac_acomp_exit(struct hdac_bus *bus); |
---|
21 | 26 | int snd_hdac_acomp_register_notifier(struct hdac_bus *bus, |
---|
.. | .. |
---|
25 | 30 | { |
---|
26 | 31 | return 0; |
---|
27 | 32 | } |
---|
28 | | -static inline int snd_hdac_display_power(struct hdac_bus *bus, bool enable) |
---|
| 33 | +static inline void snd_hdac_display_power(struct hdac_bus *bus, |
---|
| 34 | + unsigned int idx, bool enable) |
---|
29 | 35 | { |
---|
30 | | - return 0; |
---|
31 | 36 | } |
---|
32 | 37 | static inline int snd_hdac_sync_audio_rate(struct hdac_device *codec, |
---|
33 | 38 | hda_nid_t nid, int dev_id, int rate) |
---|
.. | .. |
---|
42 | 47 | } |
---|
43 | 48 | static inline int snd_hdac_acomp_init(struct hdac_bus *bus, |
---|
44 | 49 | const struct drm_audio_component_audio_ops *aops, |
---|
45 | | - int (*match_master)(struct device *, void *), |
---|
| 50 | + int (*match_master)(struct device *, |
---|
| 51 | + int, void *), |
---|
46 | 52 | size_t extra_size) |
---|
47 | 53 | { |
---|
48 | 54 | return -ENODEV; |
---|