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

Commit 296c6ae0 authored by David Miller's avatar David Miller Committed by Dave Airlie
Browse files

drm: ati_pcigart: Need to use PCI_DMA_BIDIRECTIONAL. 



The buffers mapped by the PCI GART can be written to by the device,
not just read.

For example, this happens via the RB_RPTR writeback on Radeon.

So we can't use PCI_DMA_TODEVICE else we'll get protection faults
on IOMMU platforms.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 5a7aad9a

drivers/gpu/drm/ati_pcigart.c

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info 
			if (!entry->busaddr[i])

				break;

			pci_unmap_page(dev->pdev, entry->busaddr[i],

					 PAGE_SIZE, PCI_DMA_TODEVICE);

					 PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);

		}



		if (gart_info->gart_table_location == DRM_ATI_GART_MAIN)
@@ -145,7 +145,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga 
	for (i = 0; i < pages; i++) {

		/* we need to support large memory configurations */

		entry->busaddr[i] = pci_map_page(dev->pdev, entry->pagelist[i],

						 0, PAGE_SIZE, PCI_DMA_TODEVICE);

						 0, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);

		if (entry->busaddr[i] == 0) {

			DRM_ERROR("unable to map PCIGART pages!\n");

			drm_ati_pcigart_cleanup(dev, gart_info);