Changeset 709

Timestamp:

Jan 11, 2022, 4:25:53 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/hda/Makefile (modified) (1 diff)
• alsa-kernel/hda/hdmi_chmap.c (copied) (copied from GPL/branches/uniaud32-next/alsa-kernel/hda/hdmi_chmap.c )
• alsa-kernel/pci/hda/Makefile (modified) (1 diff)
• alsa-kernel/pci/hda/hda_eld.c (copied) (copied from GPL/branches/uniaud32-next/alsa-kernel/pci/hda/hda_eld.c )
• alsa-kernel/pci/hda/patch_hdmi.c (modified) (9 diffs)
• include/linux/bitops.h (modified) (1 diff)
• include/linux/pci.h (modified) (1 diff)
• lib32/ossidc.c (modified) (1 diff)
• uniaud.inc (modified) (1 diff)

GPL/trunk/alsa-kernel/hda/Makefile

@@ -13 +13 @@
 #
 #===================================================================
-FILES = hdac_device.obj array.obj hdac_stream.obj hdac_controller.obj hdac_bus.obj hda_bus_type.obj hdac_regmap.obj
+FILES = hdac_device.obj array.obj hdac_stream.obj hdac_controller.obj hdac_bus.obj hda_bus_type.obj hdac_regmap.obj hdmi_chmap.obj
 
 TARGET = hdac

GPL/trunk/alsa-kernel/pci/hda/Makefile

@@ -13 +13 @@
 #===================================================================
 FILES = hda_intel.obj hda_codec.obj hda_controller.obj hda_auto_parser.obj hda_jack.obj &
-  hda_proc.obj hda_generic.obj hda_hwdep.obj hda_sysfs.obj hda_bind.obj &
+  hda_proc.obj hda_generic.obj hda_hwdep.obj hda_sysfs.obj hda_bind.obj hda_eld.obj &
   patch_analog.obj patch_cmedia.obj patch_conexant.obj patch_ca0110.obj patch_ca0132.obj patch_cirrus.obj &
-  patch_realtek.obj patch_si3054.obj patch_sigmatel.obj patch_via.obj
+  patch_hdmi.obj patch_realtek.obj patch_si3054.obj patch_sigmatel.obj patch_via.obj
 
 TARGET = hda

GPL/trunk/alsa-kernel/pci/hda/patch_hdmi.c

@@ -25 +25 @@
 #ifdef TARGET_OS2
 #include <linux/mod_devicetable.h>
+#define wmb()
 #endif
 #include <sound/core.h>
@@ -51 +52 @@
 
 static bool enable_silent_stream =
+#ifndef TARGET_OS2
 IS_ENABLED(CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM);
+#else
+1
+#endif
 module_param(enable_silent_stream, bool, 0644);
 MODULE_PARM_DESC(enable_silent_stream, "Enable Silent Stream for HDMI devices");
@@ -1950 +1955 @@
         SND_PCI_QUIRK(0x1462, 0xec94, "MS-7C94", 1),
         SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", 1),
-        {}
+        {0}
 };
 
@@ -2016 +2021 @@
          * This should never happen.
          */
+        #ifndef TARGET_OS2
         if (WARN_ON(spdif == NULL)) {
                 mutex_unlock(&codec->spdif_mutex);
                 return true;
         }
+        #endif
         non_pcm = !!(spdif->status & IEC958_AES0_NONAUDIO);
         mutex_unlock(&codec->spdif_mutex);
@@ -2039 +2046 @@
         int pin_idx;
         struct hdmi_spec_per_pin *per_pin;
+        #ifndef TARGET_OS2
         struct snd_pcm_runtime *runtime = substream->runtime;
+        #endif
         bool non_pcm;
         int pinctl, stripe;
@@ -2075 +2084 @@
         /* Call sync_audio_rate to set the N/CTS/M manually if necessary */
         /* Todo: add DP1.2 MST audio support later */
+        #ifndef TARGET_OS2
         if (codec_has_acomp(codec))
                 snd_hdac_sync_audio_rate(&codec->core, per_pin->pin_nid,
                                          per_pin->dev_id, runtime->rate);
+        #endif
 
         non_pcm = check_non_pcm_per_cvt(codec, cvt_nid);
@@ -2461 +2472 @@
         if (spec->acomp_registered) {
                 snd_hdac_acomp_exit(&codec->bus->core);
+        #ifndef TARGET_OS2
         } else if (codec_has_acomp(codec)) {
                 snd_hdac_acomp_register_notifier(&codec->bus->core, NULL);
+        #endif
         }
         codec->relaxed_resume = 0;
@@ -2664 +2677 @@
          * the state will be updated at resume
          */
+#ifndef TARGET_OS2
         if (codec->core.dev.power.power_state.event == PM_EVENT_SUSPEND)
                 return;
+#endif
         /* ditto during suspend/resume process itself */
         if (snd_hdac_is_in_pm(&codec->core))
@@ -2850 +2865 @@
          * the state will be updated at resume
          */
+#ifndef TARGET_OS2
         if (codec->core.dev.power.power_state.event == PM_EVENT_SUSPEND)
                 return;
+#endif
         /* ditto during suspend/resume process itself */
         if (snd_hdac_is_in_pm(&codec->core))

GPL/trunk/include/linux/bitops.h

@@ -198 +198 @@
 }
 
+static inline unsigned long hweight_long(unsigned long w)
+{
+        return hweight32(w);
+}
+
 #endif /* _I386_BITOPS_H */

GPL/trunk/include/linux/pci.h

@@ -769 +769 @@
                                PCI_STATUS_PARITY)
 
+#define dev_is_pci(d) (true)
+
 #endif /* LINUX_PCI_H */

GPL/trunk/lib32/ossidc.c

@@ -133 +133 @@
         call_module_init(cmedia_driver_init);
         call_module_init(conexant_driver_init);
-//      call_module_init(hdmi_driver_init);
+        call_module_init(hdmi_driver_init);
         call_module_init(realtek_driver_init);
         call_module_init(sigmatel_driver_init);

GPL/trunk/uniaud.inc

@@ -7 +7 @@
 # BUILDVERSION must be 3 parts, and only numbers like 5.44.108
 # The second and third numbers must be 2 digits
-BUILDVERSION = 3.01.03
+BUILDVERSION = 3.01.04
 
 # Fixpack version