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

Browse source

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

...

This commit is contained in:

Dave Airlie 2011-02-23 12:06:39 +10:00

parent 7811bddb66 5a893fc28f

commit de1e7cd63a

12 changed files with 119 additions and 36 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/gpu/drm/nouveau/nouveau_mem.c

View file

31

drivers/gpu/drm/nouveau/nouveau_sgdma.c

View file

4

drivers/gpu/drm/radeon/radeon.h

View file

36

drivers/gpu/drm/radeon/radeon_gart.c

View file

9

drivers/gpu/drm/radeon/radeon_ttm.c

View file

3

drivers/gpu/drm/ttm/ttm_agp_backend.c

View file

35

drivers/gpu/drm/ttm/ttm_page_alloc.c

View file

12

drivers/gpu/drm/ttm/ttm_tt.c

View file

3

drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c

View file

2

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

View file