drm/ati_pcigart: fix the PCIGART to use drm_pci to allocate GART table. (b05c2385) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/char/drm/ati_pcigart.c

+22 −69

Original line number	Original line	Diff line number	Diff line
	@@ -35,42 +35,23 @@

	# define ATI_PCIGART_PAGE_SIZE 4096 /*< PCI GART page size /		# define ATI_PCIGART_PAGE_SIZE 4096 /*< PCI GART page size /

	static void *drm_ati_alloc_pcigart_table(int order)		static int drm_ati_alloc_pcigart_table(struct drm_device *dev,
			struct drm_ati_pcigart_info *gart_info)
	{		{
	unsigned long address;		gart_info->table_handle = drm_pci_alloc(dev, gart_info->table_size,
	struct page *page;		PAGE_SIZE,
	int i;		gart_info->table_mask);
			if (gart_info->table_handle == NULL)
	DRM_DEBUG("%d order\n", order);		return -ENOMEM;

	address = __get_free_pages(GFP_KERNEL \| __GFP_COMP,
	order);
	if (address == 0UL) {
	return NULL;
	}

	page = virt_to_page(address);

	for (i = 0; i < order; i++, page++)
	SetPageReserved(page);

	DRM_DEBUG("returning 0x%08lx\n", address);		return 0;
	return (void *)address;
	}		}

	static void drm_ati_free_pcigart_table(void *address, int order)		static void drm_ati_free_pcigart_table(struct drm_device *dev,
			struct drm_ati_pcigart_info *gart_info)
	{		{
	struct page *page;		drm_pci_free(dev, gart_info->table_handle);
	int i;		gart_info->table_handle = NULL;
	int num_pages = 1 << order;
	DRM_DEBUG("\n");

	page = virt_to_page((unsigned long)address);

	for (i = 0; i < num_pages; i++, page++)
	ClearPageReserved(page);

	free_pages((unsigned long)address, order);
	}		}

	int drm_ati_pcigart_cleanup(struct drm_device dev, struct drm_ati_pcigart_info gart_info)		int drm_ati_pcigart_cleanup(struct drm_device dev, struct drm_ati_pcigart_info gart_info)
	@@ -78,8 +59,7 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info
	struct drm_sg_mem *entry = dev->sg;		struct drm_sg_mem *entry = dev->sg;
	unsigned long pages;		unsigned long pages;
	int i;		int i;
	int order;		int max_pages;
	int num_pages, max_pages;

	/* we need to support large memory configurations */		/* we need to support large memory configurations */
	if (!entry) {		if (!entry) {
	@@ -87,15 +67,7 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info
	return 0;		return 0;
	}		}

	order = drm_order((gart_info->table_size + (PAGE_SIZE-1)) / PAGE_SIZE);
	num_pages = 1 << order;

	if (gart_info->bus_addr) {		if (gart_info->bus_addr) {
	if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) {
	pci_unmap_single(dev->pdev, gart_info->bus_addr,
	num_pages * PAGE_SIZE,
	PCI_DMA_TODEVICE);
	}

	max_pages = (gart_info->table_size / sizeof(u32));		max_pages = (gart_info->table_size / sizeof(u32));
	pages = (entry->pages <= max_pages)		pages = (entry->pages <= max_pages)
	@@ -112,10 +84,9 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info
	gart_info->bus_addr = 0;		gart_info->bus_addr = 0;
	}		}

	if (gart_info->gart_table_location == DRM_ATI_GART_MAIN		if (gart_info->gart_table_location == DRM_ATI_GART_MAIN &&
	&& gart_info->addr) {		gart_info->table_handle) {
	drm_ati_free_pcigart_table(gart_info->addr, order);		drm_ati_free_pcigart_table(dev, gart_info);
	gart_info->addr = NULL;
	}		}

	return 1;		return 1;
	@@ -127,11 +98,10 @@ int drm_ati_pcigart_init(struct drm_device dev, struct drm_ati_pcigart_info ga
	struct drm_sg_mem *entry = dev->sg;		struct drm_sg_mem *entry = dev->sg;
	void *address = NULL;		void *address = NULL;
	unsigned long pages;		unsigned long pages;
	u32 *pci_gart, page_base, bus_address = 0;		u32 *pci_gart, page_base;
			dma_addr_t bus_address = 0;
	int i, j, ret = 0;		int i, j, ret = 0;
	int order;
	int max_pages;		int max_pages;
	int num_pages;

	if (!entry) {		if (!entry) {
	DRM_ERROR("no scatter/gather memory!\n");		DRM_ERROR("no scatter/gather memory!\n");
	@@ -141,31 +111,14 @@ int drm_ati_pcigart_init(struct drm_device dev, struct drm_ati_pcigart_info ga
	if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) {		if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) {
	DRM_DEBUG("PCI: no table in VRAM: using normal RAM\n");		DRM_DEBUG("PCI: no table in VRAM: using normal RAM\n");

	order = drm_order((gart_info->table_size +		ret = drm_ati_alloc_pcigart_table(dev, gart_info);
	(PAGE_SIZE-1)) / PAGE_SIZE);		if (ret) {
	num_pages = 1 << order;
	address = drm_ati_alloc_pcigart_table(order);
	if (!address) {
	DRM_ERROR("cannot allocate PCI GART page!\n");		DRM_ERROR("cannot allocate PCI GART page!\n");
	goto done;		goto done;
	}		}

	if (!dev->pdev) {		address = gart_info->table_handle->vaddr;
	DRM_ERROR("PCI device unknown!\n");		bus_address = gart_info->table_handle->busaddr;
	goto done;
	}

	bus_address = pci_map_single(dev->pdev, address,
	num_pages * PAGE_SIZE,
	PCI_DMA_TODEVICE);
	if (bus_address == 0) {
	DRM_ERROR("unable to map PCIGART pages!\n");
	order = drm_order((gart_info->table_size +
	(PAGE_SIZE-1)) / PAGE_SIZE);
	drm_ati_free_pcigart_table(address, order);
	address = NULL;
	goto done;
	}
	} else {		} else {
	address = gart_info->addr;		address = gart_info->addr;
	bus_address = gart_info->bus_addr;		bus_address = gart_info->bus_addr;

drivers/char/drm/drmP.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -54,6 +54,7 @@
	#include <linux/pci.h>		#include <linux/pci.h>
	#include <linux/jiffies.h>		#include <linux/jiffies.h>
	#include <linux/smp_lock.h> /* For (un)lock_kernel */		#include <linux/smp_lock.h> /* For (un)lock_kernel */
			#include <linux/dma-mapping.h>
	#include <linux/mm.h>		#include <linux/mm.h>
	#include <linux/cdev.h>		#include <linux/cdev.h>
	#include <linux/mutex.h>		#include <linux/mutex.h>
	@@ -551,6 +552,8 @@ struct drm_ati_pcigart_info {
	int gart_reg_if;		int gart_reg_if;
	void *addr;		void *addr;
	dma_addr_t bus_addr;		dma_addr_t bus_addr;
			dma_addr_t table_mask;
			struct drm_dma_handle *table_handle;
	drm_local_map_t mapping;		drm_local_map_t mapping;
	int table_size;		int table_size;
	};		};

drivers/char/drm/r128_cce.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -558,6 +558,7 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
	#if __OS_HAS_AGP		#if __OS_HAS_AGP
	if (dev_priv->is_pci) {		if (dev_priv->is_pci) {
	#endif		#endif
			dev_priv->gart_info.table_mask = DMA_BIT_MASK(32);
	dev_priv->gart_info.gart_table_location = DRM_ATI_GART_MAIN;		dev_priv->gart_info.gart_table_location = DRM_ATI_GART_MAIN;
	dev_priv->gart_info.table_size = R128_PCIGART_TABLE_SIZE;		dev_priv->gart_info.table_size = R128_PCIGART_TABLE_SIZE;
	dev_priv->gart_info.addr = NULL;		dev_priv->gart_info.addr = NULL;

drivers/char/drm/radeon_cp.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1807,6 +1807,7 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
	} else		} else
	#endif		#endif
	{		{
			dev_priv->gart_info.table_mask = DMA_BIT_MASK(32);
	/* if we have an offset set from userspace */		/* if we have an offset set from userspace */
	if (dev_priv->pcigart_offset_set) {		if (dev_priv->pcigart_offset_set) {
	dev_priv->gart_info.bus_addr =		dev_priv->gart_info.bus_addr =