Merge branch 'vmwgfx-next-3.13' of git://people.freedesktop.org/~thomash/linux into drm-next

Browse source

Pull request for vmwgfx. Currently just the DMA address stuff.

* 'vmwgfx-next-3.13' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Use the linux DMA api to get valid device addresses of pages
  drm/ttm: Enable the dma page pool also for intel IOMMUs

...

This commit is contained in:

Dave Airlie 2013-11-07 12:21:42 +10:00

parent 4695b03970 d92d985177

commit 1e95ab5846

7 changed files with 634 additions and 100 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

6

drivers/gpu/drm/ttm/Makefile

View file

3

drivers/gpu/drm/ttm/ttm_page_alloc_dma.c

View file

375

drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c

View file

87

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

View file

98

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

View file

150

drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c

View file

11

include/drm/ttm/ttm_page_alloc.h

View file