bring back vtd but without inteldrm support for now

Author: marcopeereboom

sys/arch/amd64/conf/generic.amd64

@@ -56,6 +56,7 @@ acpivideo*	at acpi?
 acpivout*	at acpivideo?
 acpipwrres*	at acpi?
 aibs*		at acpi?
+acpidmar0	at acpi?
 
 mpbios0		at bios0
 

sys/arch/amd64/include/pci_machdep.h

@@ -90,7 +90,8 @@ void		*pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
 void		pci_intr_disestablish(pci_chipset_tag_t, void *);
 void		pci_decompose_tag(pci_chipset_tag_t, pcitag_t,
 		    int *, int *, int *);
-#define	pci_probe_device_hook(c, a)	(0)
+int		pci_probe_device_hook(pci_chipset_tag_t, 
+		    struct pci_attach_args *);
 
 void 		pci_dev_postattach(struct device *, struct pci_attach_args *);
 

sys/arch/amd64/pci/pci_machdep.c

@@ -147,6 +147,15 @@ struct bus_dma_tag pci_bus_dma_tag = {
 	_bus_dmamem_mmap,
 };
 
+extern void acpidmar_pci_hook(pci_chipset_tag_t, struct pci_attach_args *);
+
+int
+pci_probe_device_hook(pci_chipset_tag_t pc, struct pci_attach_args *pa)
+{
+	acpidmar_pci_hook(pc, pa);
+	return (0);
+}
+
 void
 pci_attach_hook(struct device *parent, struct device *self,
     struct pcibus_attach_args *pba)