Commit 92c69e79 authored by David Henningsson's avatar David Henningsson Committed by Takashi Iwai

ALSA: hda - hdmi: Notify userspace when ELD control changes

ELD validity can change during the lifetime of a presence detect,
so we need to be able to listen for changes on the ELD control.
Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4bd038f9
...@@ -75,6 +75,7 @@ struct hdmi_spec_per_pin { ...@@ -75,6 +75,7 @@ struct hdmi_spec_per_pin {
struct hda_codec *codec; struct hda_codec *codec;
struct hdmi_eld sink_eld; struct hdmi_eld sink_eld;
struct delayed_work work; struct delayed_work work;
struct snd_kcontrol *eld_ctl;
int repoll_count; int repoll_count;
bool non_pcm; bool non_pcm;
bool chmap_set; /* channel-map override by ALSA API? */ bool chmap_set; /* channel-map override by ALSA API? */
...@@ -413,6 +414,7 @@ static int hdmi_create_eld_ctl(struct hda_codec *codec, int pin_idx, ...@@ -413,6 +414,7 @@ static int hdmi_create_eld_ctl(struct hda_codec *codec, int pin_idx,
if (err < 0) if (err < 0)
return err; return err;
spec->pins[pin_idx].eld_ctl = kctl;
return 0; return 0;
} }
...@@ -1220,11 +1222,14 @@ static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll) ...@@ -1220,11 +1222,14 @@ static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll)
} }
mutex_lock(&pin_eld->lock); mutex_lock(&pin_eld->lock);
if (pin_eld->eld_valid && !eld->eld_valid) if (pin_eld->eld_valid && !eld->eld_valid) {
update_eld = true; update_eld = true;
eld_changed = true;
}
if (update_eld) { if (update_eld) {
pin_eld->eld_valid = eld->eld_valid; pin_eld->eld_valid = eld->eld_valid;
eld_changed = memcmp(pin_eld->eld_buffer, eld->eld_buffer, eld_changed = pin_eld->eld_size != eld->eld_size ||
memcmp(pin_eld->eld_buffer, eld->eld_buffer,
eld->eld_size) != 0; eld->eld_size) != 0;
if (eld_changed) if (eld_changed)
memcpy(pin_eld->eld_buffer, eld->eld_buffer, memcpy(pin_eld->eld_buffer, eld->eld_buffer,
...@@ -1233,6 +1238,11 @@ static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll) ...@@ -1233,6 +1238,11 @@ static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll)
pin_eld->info = eld->info; pin_eld->info = eld->info;
} }
mutex_unlock(&pin_eld->lock); mutex_unlock(&pin_eld->lock);
if (eld_changed)
snd_ctl_notify(codec->bus->card,
SNDRV_CTL_EVENT_MASK_VALUE | SNDRV_CTL_EVENT_MASK_INFO,
&per_pin->eld_ctl->id);
} }
static void hdmi_repoll_eld(struct work_struct *work) static void hdmi_repoll_eld(struct work_struct *work)
......
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