Merge branch 'drm-ttm-unmappable' into drm-core-next

Browse source

* drm-ttm-unmappable:
  drm/radeon/kms: enable use of unmappable VRAM V2
  drm/ttm: remove io_ field from TTM V6
  drm/vmwgfx: add support for new TTM fault callback V5
  drm/nouveau/kms: add support for new TTM fault callback V5
  drm/radeon/kms: add support for new fault callback V7
  drm/ttm: ttm_fault callback to allow driver to handle bo placement V6
  drm/ttm: split no_wait argument in 2 GPU or reserve wait

Conflicts:
	drivers/gpu/drm/nouveau/nouveau_bo.c

...

This commit is contained in:

Dave Airlie 2010-04-20 14:15:09 +10:00

parent a8089e849a 6b8b1786a8

commit 7547a917fa

18 changed files with 397 additions and 269 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

29

include/drm/ttm/ttm_bo_api.h

View file

57

include/drm/ttm/ttm_bo_driver.h

View file