Changeset 708

Timestamp:

Oct 29, 2021, 1:10:50 AM (4 years ago)

Author:

Paul Smedley

Message:

Re-enable patch_hdmi.c

Location:

GPL/branches/uniaud32-next

Files:

• alsa-kernel/hda/Makefile (modified) (1 diff)
• alsa-kernel/hda/hdmi_chmap.c (added)
• alsa-kernel/pci/hda/Makefile (modified) (1 diff)
• alsa-kernel/pci/hda/hda_eld.c (added)
• alsa-kernel/pci/hda/patch_hdmi.c (modified) (5 diffs)
• include/linux/bitops.h (modified) (1 diff)
• include/linux/pci.h (modified) (1 diff)
• lib32/ossidc.c (modified) (1 diff)

GPL/branches/uniaud32-next/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/branches/uniaud32-next/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/branches/uniaud32-next/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}
 };
 
@@ -2664 +2669 @@
          * 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 +2857 @@
          * 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/branches/uniaud32-next/include/linux/bitops.h

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

GPL/branches/uniaud32-next/include/linux/pci.h

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

GPL/branches/uniaud32-next/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);