diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-18 17:08:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-18 17:08:16 -0800 |
| commit | 6602b355c2cf8f4c628732827408606075288d28 (patch) | |
| tree | 28b4f6fb17f8bf91aee5a112ad468d009467c09a | |
| parent | 7f6f3507fdfdc8fd4e25ef7d6e760a3b695b6abf (diff) | |
| parent | ec402ba97a6479dd80488b4404a73275e894289f (diff) | |
| download | linux-stable-6602b355c2cf8f4c628732827408606075288d28.tar.gz linux-stable-6602b355c2cf8f4c628732827408606075288d28.tar.bz2 linux-stable-6602b355c2cf8f4c628732827408606075288d28.zip | |
Merge branch 'agp-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6
* 'agp-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
agp/intel-agp: Set dma_mask for capable chipsets before agp_add_bridge()
| -rw-r--r-- | drivers/char/agp/intel-agp.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index 4068467ce7b9..10e1f0390bbb 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c @@ -1161,12 +1161,6 @@ 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; } @@ -2456,6 +2450,11 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, &bridge->mode); } + if (bridge->driver->mask_memory == intel_i965_mask_memory) + 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"); + pci_set_drvdata(pdev, bridge); return agp_add_bridge(bridge); } |