@@ -79,6 +79,10 @@ struct hdac_device {
int (*exec_verb)(struct hdac_device *dev, unsigned int cmd,
unsigned int flags, unsigned int *res);
+ /* Used for hotplug notification from i915 driver */
+ void (*i915_hotplug_notify)(struct hdac_device *,
+ const struct i915_audio_hotplug_info *);
+
/* widgets */
unsigned int num_nodes;
hda_nid_t start_nid, end_nid;
@@ -118,6 +118,8 @@ static void hdac_component_master_unbind(struct device *dev)
{
struct i915_audio_component *acomp = hdac_acomp;
+ acomp->audio_ops = NULL;
+ acomp->hdac_bus = NULL;
module_put(acomp->ops->owner);
component_unbind_all(dev, acomp);
WARN_ON(acomp->ops || acomp->dev);
@@ -128,6 +130,27 @@ static const struct component_master_ops hdac_component_master_ops = {
.unbind = hdac_component_master_unbind,
};
+static void i915_audio_component_hotplug_notify(struct hdac_bus *bus,
+ const struct i915_audio_hotplug_info *info)
+{
+ struct hdac_device *d;
+
+ if (info->plugged_in)
+ dev_dbg(bus->dev, "i915 plugged in event (port = %d, connector = %d,%d)",
+ info->port, info->connector_type, info->connector_type_id);
+ else
+ dev_dbg(bus->dev, "i915 unplug event (port = %d)", info->port);
+
+ list_for_each_entry(d, &bus->codec_list, list) {
+ if (d->i915_hotplug_notify)
+ d->i915_hotplug_notify(d, info);
+ }
+}
+
+static const struct i915_audio_component_audio_ops i915_audio_component_audio_ops = {
+ .hotplug_notify = i915_audio_component_hotplug_notify,
+};
+
static int hdac_component_master_match(struct device *dev, void *data)
{
/* i915 is the only supported component */
@@ -163,6 +186,9 @@ int snd_hdac_i915_init(struct hdac_bus *bus)
ret = -ENODEV;
goto out_master_del;
}
+ acomp->audio_ops = &i915_audio_component_audio_ops;
+ acomp->hdac_bus = bus;
+
dev_dbg(dev, "bound to i915 component master\n");
return 0;
This lets interested codec(s) be notified of HDMI hotplug events sent from the i915 driver. Signed-off-by: David Henningsson <david.henningsson@canonical.com> --- include/sound/hdaudio.h | 4 ++++ sound/hda/hdac_i915.c | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+)