Changeset 695 for GPL/trunk/alsa-kernel/hda

Timestamp:

Aug 21, 2021, 3:35:34 AM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/hda/ext/hdac_ext_controller.c (modified) (2 diffs)
• alsa-kernel/hda/ext/hdac_ext_stream.c (modified) (1 diff)
• alsa-kernel/hda/hdac_bus.c (modified) (2 diffs)
• alsa-kernel/hda/hdac_controller.c (modified) (1 diff)
• alsa-kernel/hda/hdac_regmap.c (modified) (1 diff)
• alsa-kernel/hda/hdac_stream.c (modified) (2 diffs)
• alsa-kernel/hda/hdac_sysfs.c (modified) (1 diff)

GPL/trunk/alsa-kernel/hda/ext/hdac_ext_controller.c

@@ -134 +134 @@
 
 /**
- * snd_hdac_ext_bus_get_link_index - get link based on codec name
+ * snd_hdac_ext_bus_get_link - get link based on codec name
  * @bus: the pointer to HDAC bus object
  * @codec_name: codec name
@@ -333 +333 @@
 }
 EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_put);
+
+static void hdac_ext_codec_link_up(struct hdac_device *codec)
+{
+        const char *devname = dev_name(&codec->dev);
+        struct hdac_ext_link *hlink =
+                snd_hdac_ext_bus_get_link(codec->bus, devname);
+
+        if (hlink)
+                snd_hdac_ext_bus_link_get(codec->bus, hlink);
+}
+
+static void hdac_ext_codec_link_down(struct hdac_device *codec)
+{
+        const char *devname = dev_name(&codec->dev);
+        struct hdac_ext_link *hlink =
+                snd_hdac_ext_bus_get_link(codec->bus, devname);
+
+        if (hlink)
+                snd_hdac_ext_bus_link_put(codec->bus, hlink);
+}
+
+void snd_hdac_ext_bus_link_power(struct hdac_device *codec, bool enable)
+{
+        struct hdac_bus *bus = codec->bus;
+        bool oldstate = test_bit(codec->addr, &bus->codec_powered);
+
+        if (enable == oldstate)
+                return;
+
+        snd_hdac_bus_link_power(codec, enable);
+
+        if (enable)
+                hdac_ext_codec_link_up(codec);
+        else
+                hdac_ext_codec_link_down(codec);
+}
+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_power);

GPL/trunk/alsa-kernel/hda/ext/hdac_ext_stream.c

@@ -134 +134 @@
 
 /**
- * snd_hdac_ext_linkstream_start - start a stream
+ * snd_hdac_ext_link_stream_start - start a stream
  * @stream: HD-audio ext core stream to start
  */

GPL/trunk/alsa-kernel/hda/hdac_bus.c

@@ -25 +25 @@
         .command = snd_hdac_bus_send_cmd,
         .get_response = snd_hdac_bus_get_response,
+        .link_power = snd_hdac_bus_link_power,
 };
 
@@ -276 +277 @@
 EXPORT_SYMBOL_GPL(snd_hdac_aligned_write);
 #endif /* CONFIG_SND_HDA_ALIGNED_MMIO */
+
+void snd_hdac_codec_link_up(struct hdac_device *codec)
+{
+        struct hdac_bus *bus = codec->bus;
+
+        if (bus->ops->link_power)
+                bus->ops->link_power(codec, true);
+        else
+                snd_hdac_bus_link_power(codec, true);
+}
+EXPORT_SYMBOL_GPL(snd_hdac_codec_link_up);
+
+void snd_hdac_codec_link_down(struct hdac_device *codec)
+{
+        struct hdac_bus *bus = codec->bus;
+
+        if (bus->ops->link_power)
+                bus->ops->link_power(codec, false);
+        else
+                snd_hdac_bus_link_power(codec, false);
+}
+EXPORT_SYMBOL_GPL(snd_hdac_codec_link_down);

GPL/trunk/alsa-kernel/hda/hdac_controller.c

@@ -655 +655 @@
 }
 EXPORT_SYMBOL_GPL(snd_hdac_bus_free_stream_pages);
+
+/**
+ * snd_hdac_bus_link_power - power up/down codec link
+ * @codec: HD-audio device
+ * @enable: whether to power-up the link
+ */
+void snd_hdac_bus_link_power(struct hdac_device *codec, bool enable)
+{
+        if (enable)
+                set_bit(codec->addr, &codec->bus->codec_powered);
+        else
+                clear_bit(codec->addr, &codec->bus->codec_powered);
+}
+EXPORT_SYMBOL_GPL(snd_hdac_bus_link_power);

GPL/trunk/alsa-kernel/hda/hdac_regmap.c

@@ -387 +387 @@
 
 /**
- * snd_hdac_regmap_init - Release the regmap from HDA codec
+ * snd_hdac_regmap_exit - Release the regmap from HDA codec
  * @codec: the codec object
  */

GPL/trunk/alsa-kernel/hda/hdac_stream.c

@@ -441 +441 @@
         if (!azx_dev->no_period_wakeup && pos_adj > 0) {
                 pos_align = pos_adj;
-                pos_adj = (pos_adj * runtime->rate + 47999) / 48000;
+                pos_adj = DIV_ROUND_UP(pos_adj * runtime->rate, 48000);
                 if (!pos_adj)
                         pos_adj = pos_align;
                 else
-                        pos_adj = ((pos_adj + pos_align - 1) / pos_align) *
-                                pos_align;
+                        pos_adj = roundup(pos_adj, pos_align);
                 pos_adj = frames_to_bytes(runtime, pos_adj);
                 if (pos_adj >= period_bytes) {
@@ -625 +624 @@
 
 /**
- * snd_hdac_stream_sync - sync with start/strop trigger operation
+ * snd_hdac_stream_sync - sync with start/stop trigger operation
  * @azx_dev: HD-audio core stream (master stream)
  * @start: true = start, false = stop

GPL/trunk/alsa-kernel/hda/hdac_sysfs.c

@@ -67 +67 @@
 };
 
-static struct attribute_group hdac_dev_attr_group = {
+static const struct attribute_group hdac_dev_attr_group = {
         .attrs  = hdac_dev_attrs,
 };