From: Dave Airlie <airlied@redhat.com>
Date: Wed, 23 Feb 2011 02:06:39 +0000 (+1000)
Subject: Merge branch 'stable/ttm.pci-api.v5' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.39-rc1~79^2~31
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=de1e7cd63a8ec26a3bd3740708cfd72dd76509e2

Merge branch 'stable/ttm.pci-api.v5' of git://git./linux/kernel/git/konrad/xen into drm-next

* 'stable/ttm.pci-api.v5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  ttm: Include the 'struct dev' when using the DMA API.
  nouveau/ttm/PCIe: Use dma_addr if TTM has set it.
  radeon/ttm/PCIe: Use dma_addr if TTM has set it.
  ttm: Expand (*populate) to support an array of DMA addresses.
  ttm: Utilize the DMA API for pages that have TTM_PAGE_FLAG_DMA32 set.
  ttm: Introduce a placeholder for DMA (bus) addresses.
---

de1e7cd63a8ec26a3bd3740708cfd72dd76509e2
diff --cc drivers/gpu/drm/nouveau/nouveau_sgdma.c
index 9a250eb53098,bbdd982cbb3e..07b115184b87
--- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
@@@ -12,9 -12,10 +12,10 @@@ struct nouveau_sgdma_be 
  	struct drm_device *dev;
  
  	dma_addr_t *pages;
+ 	bool *ttm_alloced;
  	unsigned nr_pages;
  
 -	unsigned pte_start;
 +	u64 offset;
  	bool bound;
  };
  
diff --cc include/drm/ttm/ttm_bo_driver.h
index 1da8af6ac884,4d97014e8c8d..38ff06822609
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@@ -547,9 -533,9 +551,10 @@@ struct ttm_bo_device 
  	struct list_head device_list;
  	struct ttm_bo_global *glob;
  	struct ttm_bo_driver *driver;
+ 	struct device *dev;
  	rwlock_t vm_lock;
  	struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
 +	spinlock_t fence_lock;
  	/*
  	 * Protected by the vm lock.
  	 */