Merge branch 'stable/ttm.pci-api.v5' of git://git.kernel.org/pub/scm/linux/kernel...

* '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.

diff --cc drivers/gpu/drm/nouveau/nouveau_mem.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_sgdma.c
index 9a250eb53098716f771f981beb2f749d567ca446,bbdd982cbb3e0e4f3d59d0f776350e2092762f5f..07b115184b876f2e2577bba59fbae8c2be31fd80
--- 1/drivers/gpu/drm/nouveau/nouveau_sgdma.c
--- 2/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 drivers/gpu/drm/radeon/radeon.h
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_gart.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_ttm.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
Simple merge

diff --cc include/drm/ttm/ttm_bo_driver.h
index 1da8af6ac884b0c79bd9cfd19ceba158a7e9be52,4d97014e8c8df985db3d072ace1e6b45fc282897..38ff0682260927c6b95b0bbc81f00903bdbb7a30
--- 1/include/drm/ttm/ttm_bo_driver.h
--- 2/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.
         */