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

mariux64 · Aug 5, 2009 · 94aa9b9 · 94aa9b9
2 parents b7f3158 + ba3139f
commit 94aa9b9
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
@@ -1140,6 +1140,12 @@ static int intel_i915_configure(void)
 
 	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;
 }