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

Timestamp:

Apr 19, 2025, 8:08:37 PM (5 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_controller.c (modified) (3 diffs)

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

@@ -80 +80 @@
         snd_hdac_chip_writew(bus, RINTCNT, 1);
         /* enable rirb dma and response irq */
-        snd_hdac_chip_writeb(bus, RIRBCTL, AZX_RBCTL_DMA_EN | AZX_RBCTL_IRQ_EN);
+        if (bus->not_use_interrupts)
+                snd_hdac_chip_writeb(bus, RIRBCTL, AZX_RBCTL_DMA_EN);
+        else
+                snd_hdac_chip_writeb(bus, RIRBCTL, AZX_RBCTL_DMA_EN | AZX_RBCTL_IRQ_EN);
         /* Accept unsolicited responses */
         snd_hdac_chip_updatel(bus, GCTL, AZX_GCTL_UNSOL, AZX_GCTL_UNSOL);
@@ -481 +484 @@
                 snd_hdac_stream_updateb(azx_dev, SD_CTL, SD_INT_MASK, 0);
 
-        /* disable SIE for all streams */
-        snd_hdac_chip_writeb(bus, INTCTL, 0);
-
-        /* disable controller CIE and GIE */
-        snd_hdac_chip_updatel(bus, INTCTL, AZX_INT_CTRL_EN | AZX_INT_GLOBAL_EN, 0);
+        /* disable SIE for all streams & disable controller CIE and GIE */
+        snd_hdac_chip_writel(bus, INTCTL, 0);
 }
 
@@ -588 +588 @@
                         snd_hdac_stream_writeb(azx_dev, SD_STS, SD_INT_MASK);
                         handled |= 1 << azx_dev->index;
-                        if (!azx_dev->substream || !azx_dev->running ||
-                            !(sd_status & SD_INT_COMPLETE))
+                        if ((!azx_dev->substream && !azx_dev->cstream) ||
+                            !azx_dev->running || !(sd_status & SD_INT_COMPLETE))
                                 continue;
                         if (ack)