From: Dave Airlie <airl...@redhat.com>
The list_lru will now handle numa for us, so need to keep
separate pool types for it. Just consoldiate into the global ones.
This adds a debugfs change to avoid dumping non-existant orders due
to this change.
Cc: Christian Koenig <christian.koe...@amd.com>
Cc: Johannes Weiner <han...@cmpxchg.org>
Signed-off-by: Dave Airlie <airl...@redhat.com>
---
drivers/gpu/drm/ttm/ttm_pool.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.c
index df6b81a43893..e26d57676fe3 100644
--- a/drivers/gpu/drm/ttm/ttm_pool.c
+++ b/drivers/gpu/drm/ttm/ttm_pool.c
@@ -398,17 +398,11 @@ static struct ttm_pool_type *ttm_pool_select_type(struct
ttm_pool *pool,
#ifdef CONFIG_X86
switch (caching) {
case ttm_write_combined:
- if (pool->nid != NUMA_NO_NODE)
- return &pool->caching[caching].orders[order];
-
if (pool->use_dma32)
return &global_dma32_write_combined[order];
return &global_write_combined[order];
case ttm_uncached:
- if (pool->nid != NUMA_NO_NODE)
- return &pool->caching[caching].orders[order];
-
if (pool->use_dma32)
return &global_dma32_uncached[order];
@@ -1283,7 +1277,7 @@ int ttm_pool_debugfs(struct ttm_pool *pool, struct
seq_file *m)
{
unsigned int i;
- if (!pool->use_dma_alloc && pool->nid == NUMA_NO_NODE) {
+ if (!pool->use_dma_alloc) {
seq_puts(m, "unused\n");
return 0;
}
@@ -1294,10 +1288,7 @@ int ttm_pool_debugfs(struct ttm_pool *pool, struct
seq_file *m)
for (i = 0; i < TTM_NUM_CACHING_TYPES; ++i) {
if (!ttm_pool_select_type(pool, i, 0))
continue;
- if (pool->use_dma_alloc)
- seq_puts(m, "DMA ");
- else
- seq_printf(m, "N%d ", pool->nid);
+ seq_puts(m, "DMA ");
switch (i) {
case ttm_cached:
seq_puts(m, "\t:");
--
2.49.0
