Merge git://git.infradead.org/~dwmw2/iommu-agp into agp-next

This commit is contained in:
Dave Airlie 2009-08-05 17:28:35 +10:00
commit 94aa9b9ab0

View File

@ -1140,6 +1140,12 @@ static int intel_i915_configure(void)
intel_i9xx_setup_flush(); intel_i9xx_setup_flush();
#ifdef USE_PCI_DMA_API
if (pci_set_dma_mask(intel_private.pcidev, DMA_BIT_MASK(36)))
dev_err(&intel_private.pcidev->dev,
"set gfx device dma mask 36bit failed!\n");
#endif
return 0; return 0;
} }