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

Commit 877fdacf authored by Zhenyu Wang's avatar Zhenyu Wang Committed by Eric Anholt
Browse files

agp/intel: set 40-bit dma mask on Sandybridge 



Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 156dadc1

drivers/char/agp/intel-agp.c

+15 −9
Original line number Original line Diff line number Diff line
@@ -825,7 +825,8 @@ static const struct intel_driver_description { 
static int __devinit intel_gmch_probe(struct pci_dev *pdev,

static int __devinit intel_gmch_probe(struct pci_dev *pdev,

				      struct agp_bridge_data *bridge)

				      struct agp_bridge_data *bridge)

{

{

	int i;

	int i, mask;



	bridge->driver = NULL;

	bridge->driver = NULL;





	for (i = 0; intel_agp_chipsets[i].name != NULL; i++) {

	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);

	dev_info(&pdev->dev, "Intel %s Chipset\n", intel_agp_chipsets[i].name);





	if (bridge->driver->mask_memory == intel_i965_mask_memory) {

	if (bridge->driver->mask_memory == intel_gen6_mask_memory)

		if (pci_set_dma_mask(intel_private.pcidev, DMA_BIT_MASK(36)))

		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,

		dev_err(&intel_private.pcidev->dev,

				"set gfx device dma mask 36bit failed!\n");

			"set gfx device dma mask %d-bit failed!\n", mask);

	else

	else

		pci_set_consistent_dma_mask(intel_private.pcidev,

		pci_set_consistent_dma_mask(intel_private.pcidev,

						    DMA_BIT_MASK(36));

					    DMA_BIT_MASK(mask));

	}





	return 1;

	return 1;

}

}