diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-12-06 11:21:36 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-06 11:21:49 (GMT) |
| commit | 32faa34dc5ed121a1e927753dcbf0ad395d3a956 (patch) | |
| tree | afad2825ec463545dda7477be40ddb437686b58d /drivers/gpu/drm/nouveau/nouveau_debugfs.c | |
| parent | bcdd6b2fd603340fbb0ed9984b32a9a066f1b806 (diff) | |
| parent | dc97b3409a790d2a21aac6e5cdb99558b5944119 (diff) | |
| download | linux-fsl-qoriq-32faa34dc5ed121a1e927753dcbf0ad395d3a956.tar.xz | |
drm/Merge branch 'drm-ttm-glisse' of ../drm-radeon-next into drm-core-next
Merge topic branch containing Jerome's TTM changes, contains one change from
Konrad to swiotlb export.
* 'drm-ttm-glisse' of ../drm-radeon-next:
drm/ttm: callback move_notify any time bo placement change v4
drm/ttm: simplify memory accounting for ttm user v2
drm/ttm: isolate dma data from ttm_tt V4
drm/nouveau: enable the ttm dma pool when swiotlb is active V3
drm/radeon/kms: enable the ttm dma pool if swiotlb is on V4
drm/ttm: provide dma aware ttm page pool code V9
drm/ttm: introduce callback for ttm_tt populate & unpopulate V4
drm/ttm: merge ttm_backend and ttm_tt V5
drm/ttm: page allocation use page array instead of list
drm/ttm: test for dma_address array allocation failure
drm/ttm: use ttm put pages function to properly restore cache attribute
drm/ttm: remove unused backend flags field
drm/ttm: remove split btw highmen and lowmem page
drm/ttm: remove userspace backed ttm object support
swiotlb: Expose swiotlb_nr_tlb function to modules
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_debugfs.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_debugfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c index 8e15923..f52c2db 100644 --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c @@ -178,6 +178,7 @@ static struct drm_info_list nouveau_debugfs_list[] = { { "memory", nouveau_debugfs_memory_info, 0, NULL }, { "vbios.rom", nouveau_debugfs_vbios_image, 0, NULL }, { "ttm_page_pool", ttm_page_alloc_debugfs, 0, NULL }, + { "ttm_dma_page_pool", ttm_dma_page_alloc_debugfs, 0, NULL }, }; #define NOUVEAU_DEBUGFS_ENTRIES ARRAY_SIZE(nouveau_debugfs_list) |