SAFE public projects git trees. - safe/jmp/linux-2.6/commit

git://ftp.safe.ca / safe / jmp / linux-2.6 / commit

author	Dave Airlie <airlied@redhat.com>
	Tue, 20 Apr 2010 04:15:09 +0000 (14:15 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Tue, 20 Apr 2010 04:15:09 +0000 (14:15 +1000)
commit	7547a917fa5f3b2406f52c7dcf7ec9ad3c8532eb
tree	59b0d0e9b6c251c4df5799b93395454592004d57	tree \| snapshot
parent	a8089e849a32c5b6bfd6c88dbd09c0ea4a779b71	commit \| diff
parent	6b8b1786a8c29ce6e32298b93ac8d4a18a2b11c4	commit \| diff

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

* 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

Full containers within linux kernel

RSS Atom

drivers/gpu/drm/nouveau/nouveau_bo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/evergreen.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r100.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r600.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_object.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_ttm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/rv770.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_bo_util.c	diff1 \|	diff2 \|	blob \| history