diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-04-20 13:12:28 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-04-20 13:12:28 +1000 |
| commit | c2b41276da65481d36311a13d69020d150861c43 (patch) | |
| tree | 5a67f674b77cfdc47bd386f114fbf5a6bff740c6 /drivers/gpu/drm/nouveau/nouveau_debugfs.c | |
| parent | 97921a5b03d40681b3aed620a5e719710336c6df (diff) | |
| parent | 2125b8a44d771351fc44719ed291be70b73672ad (diff) | |
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
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_debugfs.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_debugfs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c index a251886a0ce..7933de4aff2 100644 --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c @@ -33,6 +33,8 @@ #include "drmP.h" #include "nouveau_drv.h" +#include <ttm/ttm_page_alloc.h> + static int nouveau_debugfs_channel_info(struct seq_file *m, void *data) { @@ -159,6 +161,7 @@ static struct drm_info_list nouveau_debugfs_list[] = { { "chipset", nouveau_debugfs_chipset_info, 0, NULL }, { "memory", nouveau_debugfs_memory_info, 0, NULL }, { "vbios.rom", nouveau_debugfs_vbios_image, 0, NULL }, + { "ttm_page_pool", ttm_page_alloc_debugfs, 0, NULL }, }; #define NOUVEAU_DEBUGFS_ENTRIES ARRAY_SIZE(nouveau_debugfs_list) |