summaryrefslogtreecommitdiffstats
path: root/drivers/char/agp
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2009-08-05 17:28:35 +1000
committerDave Airlie <airlied@linux.ie>2009-08-05 17:28:35 +1000
commit94aa9b9ab09922cfd3bf52806f3ede9cde1ce300 (patch)
treec2610bee2048d113ddeb285eb19e2f3b8339b4ae /drivers/char/agp
parentb7f315842830d67081642248a3757c713b6b6684 (diff)
parentba3139f2577eee24479db73b8dfc7d78eaf4c486 (diff)
Merge git://git.infradead.org/~dwmw2/iommu-agp into agp-next
Diffstat (limited to 'drivers/char/agp')
-rw-r--r--drivers/char/agp/intel-agp.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index aa8889e8afc..9bc3a0b82b9 100644
--- 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;
}