Ticket #1072: hda_ati_nvidia.patch

src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp

@@ -700 +700 @@
 {
     uint16 capabilities, stateStatus, cmd;
     status_t status;
-    uint8 tcsel;
+    uint8 tcsel, tmpreg;
 
     /* Map MMIO registers */
     controller->regs_area = map_physical_memory("hda_hw_regs",
@@ -735 +735 @@
         controller->pci_info.device, controller->pci_info.function,
         PCI_HDA_TCSEL, 1, tcsel & 0xf8);
 
+    /* Enable snooping for ATI and Nvidia, right now for all their hda-devices,
+       but only based on guessing. */ 
+    switch (controller->pci_info.vendor_id) {
+        /* NVIDIA */
+        case 0x10de:
+            tmpreg = (gPci->read_pci_config)(controller->pci_info.bus, controller->pci_info.device,
+                controller->pci_info.function, NVIDIA_HDA_TRANSREG_ADDR, 1);
+            (gPci->write_pci_config)(controller->pci_info.bus, controller->pci_info.device,
+            controller->pci_info.function, NVIDIA_HDA_TRANSREG_ADDR, 1, (tmpreg & 0xf8) | NVIDIA_HDA_ENABLE_COHBITS);
+            break;
+        /* ATI */
+        case 0x1002:
+            tmpreg = (gPci->read_pci_config)(controller->pci_info.bus, controller->pci_info.device,
+                controller->pci_info.function, ATI_HDA_MISC_CNTR2_ADDR, 1);
+            (gPci->write_pci_config)(controller->pci_info.bus, controller->pci_info.device,
+            controller->pci_info.function, ATI_HDA_MISC_CNTR2_ADDR, 1, (tmpreg & 0xf8) | ATI_HDA_ENABLE_SNOOP);
+            break;
+    }   
+
     capabilities = controller->Read16(HDAC_GLOBAL_CAP);
     controller->num_input_streams = GLOBAL_CAP_INPUT_STREAMS(capabilities);
     controller->num_output_streams = GLOBAL_CAP_OUTPUT_STREAMS(capabilities);
@@ -762 +781 @@
         dprintf("hda: init_corb_rirb_pos failed\n");
         goto corb_rirb_failed;
     }
-
+    
     controller->Write16(HDAC_WAKE_ENABLE, 0x7fff);
 
     /* Enable controller interrupts */

src/add-ons/kernel/drivers/audio/hda/hda_controller_defs.h

@@ -134 +134 @@
 /* PCI space register definitions */
 #define PCI_HDA_TCSEL                   0x44
 
+#define ATI_HDA_MISC_CNTR2_ADDR         0x42
+#define ATI_HDA_ENABLE_SNOOP            0x02
+#define NVIDIA_HDA_TRANSREG_ADDR        0x4e
+#define NVIDIA_HDA_ENABLE_COHBITS       0x0f
+
+
 typedef uint32 corb_t;
 typedef struct {
     uint32 response;