Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6602b355 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 7f6f3507 ec402ba9

drivers/char/agp/intel-agp.c

+5 −6
Original line number Diff line number Diff line
@@ -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);

}