Merge branch 'drm-ttm-pool' into drm-core-next
authorDave Airlie <airlied@redhat.com>
Tue, 20 Apr 2010 03:12:28 +0000 (13:12 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 20 Apr 2010 03:12:28 +0000 (13:12 +1000)
commitc2b41276da65481d36311a13d69020d150861c43
tree5a67f674b77cfdc47bd386f114fbf5a6bff740c6
parent97921a5b03d40681b3aed620a5e719710336c6df
parent2125b8a44d771351fc44719ed291be70b73672ad
Merge branch 'drm-ttm-pool' into drm-core-next

* drm-ttm-pool:
  drm/ttm: using kmalloc/kfree requires including slab.h
  drm/ttm: include linux/seq_file.h for seq_printf
  drm/ttm: Add sysfs interface to control pool allocator.
  drm/ttm: Use set_pages_array_wc instead of set_memory_wc.
  arch/x86: Add array variants for setting memory to wc caching.
  drm/nouveau: Add ttm page pool debugfs file.
  drm/radeon/kms: Add ttm page pool debugfs file.
  drm/ttm: Add debugfs output entry to pool allocator.
  drm/ttm: add pool wc/uc page allocator V3
arch/x86/mm/pageattr.c
drivers/gpu/drm/nouveau/nouveau_debugfs.c
drivers/gpu/drm/radeon/radeon_ttm.c
drivers/gpu/drm/ttm/ttm_memory.c
drivers/gpu/drm/ttm/ttm_tt.c