diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-05 09:12:40 +0200 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-05 09:13:27 +0200 |
| commit | ba3139f2577eee24479db73b8dfc7d78eaf4c486 (patch) | |
| tree | 069924c6a9717244621bd628f7642452e98ed396 /drivers/char | |
| parent | agp: kill phys_to_gart() and gart_to_phys() (diff) | |
| download | linux-ba3139f2577eee24479db73b8dfc7d78eaf4c486.tar.xz linux-ba3139f2577eee24479db73b8dfc7d78eaf4c486.zip | |
intel-agp: Set dma mask for i915
If DMAR is configured in but absent, we really do want to make sure that
the dma mask is set appropriately. Otherwise we get mapping failures on
highmem. Spotted by Zhenyu Wang.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/agp/intel-agp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index aa8889e8afc8..9bc3a0b82b96 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; } |