From: David Henningsson <david.henningsson@canonical.com>
To: tiwai@suse.de, alsa-devel@alsa-project.org,
fengguang.wu@intel.com, pierre-louis.bossart@linux.intel.com
Cc: David Henningsson <david.henningsson@canonical.com>
Subject: [PATCH 3/3] ALSA: hda - hdmi: Notify userspace when ELD control changes
Date: Mon, 18 Feb 2013 14:11:13 +0100 [thread overview]
Message-ID: <1361193073-7199-4-git-send-email-david.henningsson@canonical.com> (raw)
In-Reply-To: <1361193073-7199-1-git-send-email-david.henningsson@canonical.com>
Since ELD sometimes becomes available a while after we have detected
presence, we need to be able to listen for changes on the ELD control.
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
sound/pci/hda/patch_hdmi.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 9236cdb..d3b1a93 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -74,6 +74,7 @@ struct hdmi_spec_per_pin {
struct hda_codec *codec;
struct hdmi_eld sink_eld;
+ struct snd_kcontrol *eld_ctl;
struct delayed_work work;
int repoll_count;
bool non_pcm;
@@ -406,6 +407,7 @@ static int hdmi_create_eld_ctl(struct hda_codec *codec, int pin_idx,
if (err < 0)
return err;
+ spec->pins[pin_idx].eld_ctl = kctl;
return 0;
}
@@ -1175,6 +1177,7 @@ static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll)
*/
int present = snd_hda_pin_sense(codec, pin_nid);
bool eld_valid = false;
+ bool old_eld_valid = eld->eld_valid;
memset(eld, 0, offsetof(struct hdmi_eld, eld_buffer));
@@ -1196,6 +1199,13 @@ static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll)
msecs_to_jiffies(300));
}
}
+
+ if (eld->eld_valid != old_eld_valid && per_pin->eld_ctl) {
+ 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)
--
1.7.9.5
next prev parent reply other threads:[~2013-02-18 13:11 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-18 13:11 [PATCH 0/3] Make HDMI ELD usable with hotplug David Henningsson
2013-02-18 13:11 ` [PATCH 1/3] ALSA: hda - hdmi: ELD shouldn't be valid after unplug David Henningsson
2013-02-18 13:11 ` [PATCH 2/3] ALSA: hda - hdmi: Do not expose eld data when eld is invalid David Henningsson
2013-02-18 14:39 ` Takashi Iwai
2013-02-18 13:11 ` David Henningsson [this message]
2013-02-18 14:41 ` [PATCH 3/3] ALSA: hda - hdmi: Notify userspace when ELD control changes Takashi Iwai
2013-02-18 14:46 ` David Henningsson
2013-02-18 14:55 ` Takashi Iwai
2013-02-18 15:09 ` David Henningsson
2013-02-18 15:14 ` Takashi Iwai
2013-02-18 16:08 ` David Henningsson
2013-02-18 16:21 ` Takashi Iwai
2013-02-18 13:35 ` [PATCH 0/3] Make HDMI ELD usable with hotplug Takashi Iwai
2013-02-18 13:50 ` David Henningsson
2013-02-18 14:28 ` Takashi Iwai
2013-02-18 14:33 ` Takashi Iwai
2013-02-18 22:39 ` Ville Syrjälä
2013-02-19 2:39 ` Wang xingchao
2013-02-19 5:55 ` David Henningsson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1361193073-7199-4-git-send-email-david.henningsson@canonical.com \
--to=david.henningsson@canonical.com \
--cc=alsa-devel@alsa-project.org \
--cc=fengguang.wu@intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).