Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45c053df authored by David Henningsson's avatar David Henningsson Committed by Takashi Iwai
Browse files

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: default avatarDavid Henningsson <david.henningsson@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 51e1d83c

include/sound/hda_i915.h

+7 −0
Original line number Diff line number Diff line
@@ -4,12 +4,15 @@ 
#ifndef __SOUND_HDA_I915_H

#define __SOUND_HDA_I915_H



#include <drm/i915_component.h>



#ifdef CONFIG_SND_HDA_I915

int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable);

int snd_hdac_display_power(struct hdac_bus *bus, bool enable);

int snd_hdac_get_display_clk(struct hdac_bus *bus);

int snd_hdac_i915_init(struct hdac_bus *bus);

int snd_hdac_i915_exit(struct hdac_bus *bus);

int snd_hdac_i915_register_notifier(const struct i915_audio_component_audio_ops *);

#else

static int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable)

{
@@ -31,6 +34,10 @@ static inline int snd_hdac_i915_exit(struct hdac_bus *bus) 
{

	return 0;

}

static inline int snd_hdac_i915_register_notifier(const struct i915_audio_component_audio_ops *ops)

{

	return -ENODEV;

}

#endif



#endif /* __SOUND_HDA_I915_H */

sound/hda/hdac_i915.c

+10 −0
Original line number Diff line number Diff line
@@ -134,6 +134,16 @@ static int hdac_component_master_match(struct device *dev, void *data) 
	return !strcmp(dev->driver->name, "i915");

}



int snd_hdac_i915_register_notifier(const struct i915_audio_component_audio_ops *aops)

{

	if (WARN_ON(!hdac_acomp))

		return -ENODEV;



	hdac_acomp->audio_ops = aops;

	return 0;

}

EXPORT_SYMBOL_GPL(snd_hdac_i915_register_notifier);



int snd_hdac_i915_init(struct hdac_bus *bus)

{

	struct component_match *match = NULL;