Skip to content

Commit c21066e

Browse files
committed
ttm/pool: drop numa specific pools
The list_lru will now handle numa for us, so no need to keep separate pool types for it. Just consolidate into the global ones. This adds a debugfs change to avoid dumping non-existant orders due to this change. Cc: Christian Koenig <christian.koenig@amd.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
1 parent 444e2a1 commit c21066e

1 file changed

Lines changed: 2 additions & 11 deletions

File tree

drivers/gpu/drm/ttm/ttm_pool.c

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -406,17 +406,11 @@ static struct ttm_pool_type *ttm_pool_select_type(struct ttm_pool *pool,
406406
#ifdef CONFIG_X86
407407
switch (caching) {
408408
case ttm_write_combined:
409-
if (pool->nid != NUMA_NO_NODE)
410-
return &pool->caching[caching].orders[order];
411-
412409
if (ttm_pool_uses_dma32(pool))
413410
return &global_dma32_write_combined[order];
414411

415412
return &global_write_combined[order];
416413
case ttm_uncached:
417-
if (pool->nid != NUMA_NO_NODE)
418-
return &pool->caching[caching].orders[order];
419-
420414
if (ttm_pool_uses_dma32(pool))
421415
return &global_dma32_uncached[order];
422416

@@ -1294,7 +1288,7 @@ int ttm_pool_debugfs(struct ttm_pool *pool, struct seq_file *m)
12941288
{
12951289
unsigned int i;
12961290

1297-
if (!ttm_pool_uses_dma_alloc(pool) && pool->nid == NUMA_NO_NODE) {
1291+
if (!ttm_pool_uses_dma_alloc(pool)) {
12981292
seq_puts(m, "unused\n");
12991293
return 0;
13001294
}
@@ -1305,10 +1299,7 @@ int ttm_pool_debugfs(struct ttm_pool *pool, struct seq_file *m)
13051299
for (i = 0; i < TTM_NUM_CACHING_TYPES; ++i) {
13061300
if (!ttm_pool_select_type(pool, i, 0))
13071301
continue;
1308-
if (ttm_pool_uses_dma_alloc(pool))
1309-
seq_puts(m, "DMA ");
1310-
else
1311-
seq_printf(m, "N%d ", pool->nid);
1302+
seq_puts(m, "DMA ");
13121303
switch (i) {
13131304
case ttm_cached:
13141305
seq_puts(m, "\t:");

0 commit comments

Comments
 (0)