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

Commit ff69c00f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/ati_pcigart: fix the PCIGART to use drm_pci to allocate GART table.
  drm/radeon: fixup RV550 chip family
  drm/via: attempt again to stabilise the AGP DMA command submission.
  drm: Fix race that can lockup the kernel
parents 9e585824 b05c2385

drivers/char/drm/ati_pcigart.c

+22 −69
Original line number Diff line number Diff line
@@ -35,42 +35,23 @@ 


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

	struct page *page;

	int i;



	DRM_DEBUG("%d order\n", order);



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

	gart_info->table_handle = drm_pci_alloc(dev, gart_info->table_size,

						PAGE_SIZE,

						gart_info->table_mask);

	if (gart_info->table_handle == NULL)

		return -ENOMEM;



	DRM_DEBUG("returning 0x%08lx\n", address);

	return (void *)address;

	return 0;

}



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;

	int i;

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

	drm_pci_free(dev, gart_info->table_handle);

	gart_info->table_handle = NULL;

}



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;

	unsigned long pages;

	int i;

	int order;

	int num_pages, max_pages;

	int max_pages;



	/* we need to support large memory configurations */

	if (!entry) {
@@ -87,15 +67,7 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info 
		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->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));

		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;

	}



	if (gart_info->gart_table_location == DRM_ATI_GART_MAIN

	    && gart_info->addr) {

		drm_ati_free_pcigart_table(gart_info->addr, order);

		gart_info->addr = NULL;

	if (gart_info->gart_table_location == DRM_ATI_GART_MAIN &&

	    gart_info->table_handle) {

		drm_ati_free_pcigart_table(dev, gart_info);

	}



	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;

	void *address = NULL;

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

	int max_pages;

	int num_pages;



	if (!entry) {

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

		DRM_DEBUG("PCI: no table in VRAM: using normal RAM\n");



		order = drm_order((gart_info->table_size +

				   (PAGE_SIZE-1)) / PAGE_SIZE);

		num_pages = 1 << order;

		address = drm_ati_alloc_pcigart_table(order);

		if (!address) {

		ret = drm_ati_alloc_pcigart_table(dev, gart_info);

		if (ret) {

			DRM_ERROR("cannot allocate PCI GART page!\n");

			goto done;

		}



		if (!dev->pdev) {

			DRM_ERROR("PCI device unknown!\n");

			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;

		}

		address = gart_info->table_handle->vaddr;

		bus_address = gart_info->table_handle->busaddr;

	} else {

		address = gart_info->addr;

		bus_address = gart_info->bus_addr;

drivers/char/drm/drmP.h

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#include <linux/pci.h>

#include <linux/jiffies.h>

#include <linux/smp_lock.h>	/* For (un)lock_kernel */

#include <linux/dma-mapping.h>

#include <linux/mm.h>

#include <linux/cdev.h>

#include <linux/mutex.h>
@@ -551,6 +552,8 @@ struct drm_ati_pcigart_info { 
	int gart_reg_if;

	void *addr;

	dma_addr_t bus_addr;

	dma_addr_t table_mask;

	struct drm_dma_handle *table_handle;

	drm_local_map_t mapping;

	int table_size;

};

drivers/char/drm/drm_fops.c

+5 −2
Original line number Diff line number Diff line
@@ -326,6 +326,7 @@ int drm_release(struct inode *inode, struct file *filp) 
	struct drm_file *file_priv = filp->private_data;

	struct drm_device *dev = file_priv->head->dev;

	int retcode = 0;

	unsigned long irqflags;



	lock_kernel();
@@ -357,9 +358,11 @@ int drm_release(struct inode *inode, struct file *filp) 
			 */



			do{

				spin_lock(&dev->lock.spinlock);

				spin_lock_irqsave(&dev->lock.spinlock,

						  irqflags);

				locked = dev->lock.idle_has_lock;

				spin_unlock(&dev->lock.spinlock);

				spin_unlock_irqrestore(&dev->lock.spinlock,

						       irqflags);

				if (locked)

					break;

				schedule();

drivers/char/drm/drm_lock.c

+20 −15
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv) 
	DECLARE_WAITQUEUE(entry, current);

	struct drm_lock *lock = data;

	int ret = 0;

	unsigned long irqflags;



	++file_priv->lock_count;
@@ -71,9 +72,9 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv) 
			return -EINVAL;



	add_wait_queue(&dev->lock.lock_queue, &entry);

	spin_lock(&dev->lock.spinlock);

	spin_lock_irqsave(&dev->lock.spinlock, irqflags);

	dev->lock.user_waiters++;

	spin_unlock(&dev->lock.spinlock);

	spin_unlock_irqrestore(&dev->lock.spinlock, irqflags);

	for (;;) {

		__set_current_state(TASK_INTERRUPTIBLE);

		if (!dev->lock.hw_lock) {
@@ -95,9 +96,9 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv) 
			break;

		}

	}

	spin_lock(&dev->lock.spinlock);

	spin_lock_irqsave(&dev->lock.spinlock, irqflags);

	dev->lock.user_waiters--;

	spin_unlock(&dev->lock.spinlock);

	spin_unlock_irqrestore(&dev->lock.spinlock, irqflags);

	__set_current_state(TASK_RUNNING);

	remove_wait_queue(&dev->lock.lock_queue, &entry);
@@ -198,8 +199,9 @@ int drm_lock_take(struct drm_lock_data *lock_data, 
{

	unsigned int old, new, prev;

	volatile unsigned int *lock = &lock_data->hw_lock->lock;

	unsigned long irqflags;



	spin_lock(&lock_data->spinlock);

	spin_lock_irqsave(&lock_data->spinlock, irqflags);

	do {

		old = *lock;

		if (old & _DRM_LOCK_HELD)
@@ -211,7 +213,7 @@ int drm_lock_take(struct drm_lock_data *lock_data, 
		}

		prev = cmpxchg(lock, old, new);

	} while (prev != old);

	spin_unlock(&lock_data->spinlock);

	spin_unlock_irqrestore(&lock_data->spinlock, irqflags);



	if (_DRM_LOCKING_CONTEXT(old) == context) {

		if (old & _DRM_LOCK_HELD) {
@@ -272,15 +274,16 @@ int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context) 
{

	unsigned int old, new, prev;

	volatile unsigned int *lock = &lock_data->hw_lock->lock;

	unsigned long irqflags;



	spin_lock(&lock_data->spinlock);

	spin_lock_irqsave(&lock_data->spinlock, irqflags);

	if (lock_data->kernel_waiters != 0) {

		drm_lock_transfer(lock_data, 0);

		lock_data->idle_has_lock = 1;

		spin_unlock(&lock_data->spinlock);

		spin_unlock_irqrestore(&lock_data->spinlock, irqflags);

		return 1;

	}

	spin_unlock(&lock_data->spinlock);

	spin_unlock_irqrestore(&lock_data->spinlock, irqflags);



	do {

		old = *lock;
@@ -344,19 +347,20 @@ static int drm_notifier(void *priv) 
void drm_idlelock_take(struct drm_lock_data *lock_data)

{

	int ret = 0;

	unsigned long irqflags;



	spin_lock(&lock_data->spinlock);

	spin_lock_irqsave(&lock_data->spinlock, irqflags);

	lock_data->kernel_waiters++;

	if (!lock_data->idle_has_lock) {



		spin_unlock(&lock_data->spinlock);

		spin_unlock_irqrestore(&lock_data->spinlock, irqflags);

		ret = drm_lock_take(lock_data, DRM_KERNEL_CONTEXT);

		spin_lock(&lock_data->spinlock);

		spin_lock_irqsave(&lock_data->spinlock, irqflags);



		if (ret == 1)

			lock_data->idle_has_lock = 1;

	}

	spin_unlock(&lock_data->spinlock);

	spin_unlock_irqrestore(&lock_data->spinlock, irqflags);

}

EXPORT_SYMBOL(drm_idlelock_take);
@@ -364,8 +368,9 @@ void drm_idlelock_release(struct drm_lock_data *lock_data) 
{

	unsigned int old, prev;

	volatile unsigned int *lock = &lock_data->hw_lock->lock;

	unsigned long irqflags;



	spin_lock(&lock_data->spinlock);

	spin_lock_irqsave(&lock_data->spinlock, irqflags);

	if (--lock_data->kernel_waiters == 0) {

		if (lock_data->idle_has_lock) {

			do {
@@ -376,7 +381,7 @@ void drm_idlelock_release(struct drm_lock_data *lock_data) 
			lock_data->idle_has_lock = 0;

		}

	}

	spin_unlock(&lock_data->spinlock);

	spin_unlock_irqrestore(&lock_data->spinlock, irqflags);

}

EXPORT_SYMBOL(drm_idlelock_release);

drivers/char/drm/drm_pciids.h

+4 −3
Original line number Diff line number Diff line
@@ -205,9 +205,9 @@ 
	{0x1002, 0x71D6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x71DA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x71DE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x7200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x7210, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x7211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x7200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x7210, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x7211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x7240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x7243, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x7244, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
@@ -238,6 +238,7 @@ 
	{0x1002, 0x7834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x7835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \

	{0x1002, 0x791e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \

	{0x1002, 0x791f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \

	{0, 0, 0}



#define r128_PCI_IDS \