Changeset 777 for GPL/trunk/alsa-kernel/include/sound/hdaudio.h

Timestamp:

Apr 21, 2025, 7:17:25 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge from uniaud32-exp branch

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/sound/hdaudio.h (modified) (7 diffs)

GPL/trunk/alsa-kernel/include/sound/hdaudio.h

@@ -19 +19 @@
 #include <sound/memalloc.h>
 #include <sound/hda_verbs.h>
-#include <drm/i915_component.h>
+#ifndef TARGET_OS2
+#include <drm/intel/i915_component.h>
+#endif
 
 /* codec node id */
@@ -141 +143 @@
 int snd_hdac_get_sub_nodes(struct hdac_device *codec, hda_nid_t nid,
                            hda_nid_t *start_id);
-unsigned int snd_hdac_calc_stream_format(unsigned int rate,
-                                         unsigned int channels,
-                                         snd_pcm_format_t format,
-                                         unsigned int maxbps,
-                                         unsigned short spdif_ctls);
+unsigned int snd_hdac_stream_format_bits(snd_pcm_format_t format, snd_pcm_subformat_t subformat,
+                                         unsigned int maxbits);
+unsigned int snd_hdac_stream_format(unsigned int channels, unsigned int bits, unsigned int rate);
+unsigned int snd_hdac_spdif_stream_format(unsigned int channels, unsigned int bits,
+                                          unsigned int rate, unsigned short spdif_ctls);
 int snd_hdac_query_supported_pcm(struct hdac_device *codec, hda_nid_t nid,
-                                u32 *ratesp, u64 *formatsp, unsigned int *bpsp);
+                                 u32 *ratesp, u64 *formatsp, u32 *subformatsp,
+                                 unsigned int *bpsp);
 bool snd_hdac_is_supported_format(struct hdac_device *codec, hda_nid_t nid,
                                   unsigned int format);
@@ -362 +365 @@
         bool not_use_interrupts:1;      /* prohibiting the RIRB IRQ */
         bool access_sdnctl_in_dword:1;  /* accessing the sdnctl register by dword */
+        bool use_pio_for_commands:1;    /* Use PIO instead of CORB for commands */
 
         int poll_count;
@@ -588 +592 @@
                                         int dir, int stream_tag);
 
-int snd_hdac_stream_setup(struct hdac_stream *azx_dev);
+int snd_hdac_stream_setup(struct hdac_stream *azx_dev, bool code_loading);
 void snd_hdac_stream_cleanup(struct hdac_stream *azx_dev);
 int snd_hdac_stream_setup_periods(struct hdac_stream *azx_dev);
@@ -603 +607 @@
                           unsigned int streams);
 void snd_hdac_stream_timecounter_init(struct hdac_stream *azx_dev,
-                                      unsigned int streams);
+                                      unsigned int streams, bool start);
 int snd_hdac_get_stream_stripe_ctl(struct hdac_bus *bus,
                                 struct snd_pcm_substream *substream);
@@ -638 +642 @@
 #define snd_hdac_stream_readb_poll(dev, reg, val, cond, delay_us, timeout_us) \
         read_poll_timeout_atomic(snd_hdac_reg_readb, val, cond, delay_us, timeout_us, \
+                                 false, (dev)->bus, (dev)->sd_addr + AZX_REG_ ## reg)
+#define snd_hdac_stream_readw_poll(dev, reg, val, cond, delay_us, timeout_us) \
+        read_poll_timeout_atomic(snd_hdac_reg_readw, val, cond, delay_us, timeout_us, \
                                  false, (dev)->bus, (dev)->sd_addr + AZX_REG_ ## reg)
 #define snd_hdac_stream_readl_poll(dev, reg, val, cond, delay_us, timeout_us) \
@@ -743 +750 @@
                         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_DG2_1) }, \
                         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_DG2_2) }, \
+                        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_BMG) }, \
                         { } \
                 }, pci) || HDA_CONTROLLER_IS_HSW(pci))