Changeset 772 for GPL/trunk/alsa-kernel/hda/hdac_regmap.c

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/hda/hdac_regmap.c (modified) (4 diffs)

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

@@ -18 +18 @@
 #include <linux/export.h>
 #include <linux/pm.h>
-#include <linux/pm_runtime.h>
 #include <sound/core.h>
 #include <sound/hdaudio.h>
@@ -359 +358 @@
         .readable_reg = hda_readable_reg,
         .volatile_reg = hda_volatile_reg,
+#ifndef TARGET_OS2
+        .cache_type = REGCACHE_MAPLE,
+#else
         .cache_type = REGCACHE_RBTREE,
+#endif
         .reg_read = hda_reg_read,
         .reg_write = hda_reg_write,
@@ -570 +573 @@
                                unsigned int mask, unsigned int val)
 {
+#ifndef TARGET_OS2
+        int err = 0;
+#else
         unsigned int orig;
         int err;
-
+#endif
         if (!codec->regmap)
                 return reg_raw_update(codec, reg, mask, val);
 
         mutex_lock(&codec->regmap_lock);
+#ifndef TARGET_OS2
+        /* Discard any updates to already initialised registers. */
+        if (!regcache_reg_cached(codec->regmap, reg))
+#else
         regcache_cache_only(codec->regmap, true);
         err = regmap_read(codec->regmap, reg, &orig);
         regcache_cache_only(codec->regmap, false);
         if (err < 0)
+#endif
                 err = regmap_update_bits(codec->regmap, reg, mask, val);
         mutex_unlock(&codec->regmap_lock);
@@ -614 +625 @@
 void snd_hdac_regmap_sync(struct hdac_device *codec)
 {
-        if (codec->regmap) {
-                mutex_lock(&codec->regmap_lock);
+        mutex_lock(&codec->regmap_lock);
+        if (codec->regmap)
                 regcache_sync(codec->regmap);
-                mutex_unlock(&codec->regmap_lock);
-        }
+        mutex_unlock(&codec->regmap_lock);
 }
 EXPORT_SYMBOL_GPL(snd_hdac_regmap_sync);