1 files changed, 15 insertions, 9 deletions

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index ddf5def1b0da..ab1903955ac0 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -825,7 +825,8 @@ static const struct intel_driver_description {
 static int __devinit intel_gmch_probe(struct pci_dev *pdev,
                                       struct agp_bridge_data *bridge)
 {
-        int i;
+        int i, mask;
+
         bridge->driver = NULL;
 
         for (i = 0; intel_agp_chipsets[i].name != NULL; i++) {
@@ -845,14 +846,19 @@ static int __devinit intel_gmch_probe(struct pci_dev *pdev,
 
         dev_info(&pdev->dev, "Intel %s Chipset\n", intel_agp_chipsets[i].name);
 
-        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");
-                else
-                        pci_set_consistent_dma_mask(intel_private.pcidev,
-                                                    DMA_BIT_MASK(36));
-        }
+        if (bridge->driver->mask_memory == intel_gen6_mask_memory)
+                mask = 40;
+        else if (bridge->driver->mask_memory == intel_i965_mask_memory)
+                mask = 36;
+        else
+                mask = 32;
+
+        if (pci_set_dma_mask(intel_private.pcidev, DMA_BIT_MASK(mask)))
+                dev_err(&intel_private.pcidev->dev,
+                        "set gfx device dma mask %d-bit failed!\n", mask);
+        else
+                pci_set_consistent_dma_mask(intel_private.pcidev,
+                                            DMA_BIT_MASK(mask));
 
         return 1;
 }