Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+2
-11
+2
-11
drivers/gpu/drm/ttm/ttm_pool.c
+2
-11
drivers/gpu/drm/ttm/ttm_pool.c
···
406
406
#ifdef CONFIG_X86
407
407
switch (caching) {
408
408
case ttm_write_combined:
409
-
if (pool->nid != NUMA_NO_NODE)
410
-
return &pool->caching[caching].orders[order];
411
-
412
409
if (ttm_pool_uses_dma32(pool))
413
410
return &global_dma32_write_combined[order];
414
411
415
412
return &global_write_combined[order];
416
413
case ttm_uncached:
417
-
if (pool->nid != NUMA_NO_NODE)
418
-
return &pool->caching[caching].orders[order];
419
-
420
414
if (ttm_pool_uses_dma32(pool))
421
415
return &global_dma32_uncached[order];
422
416
···
1288
1294
{
1289
1295
unsigned int i;
1290
1296
1291
-
if (!ttm_pool_uses_dma_alloc(pool) && pool->nid == NUMA_NO_NODE) {
1297
+
if (!ttm_pool_uses_dma_alloc(pool)) {
1292
1298
seq_puts(m, "unused\n");
1293
1299
return 0;
1294
1300
}
···
1299
1305
for (i = 0; i < TTM_NUM_CACHING_TYPES; ++i) {
1300
1306
if (!ttm_pool_select_type(pool, i, 0))
1301
1307
continue;
1302
-
if (ttm_pool_uses_dma_alloc(pool))
1303
-
seq_puts(m, "DMA ");
1304
-
else
1305
-
seq_printf(m, "N%d ", pool->nid);
1308
+
seq_puts(m, "DMA ");
1306
1309
switch (i) {
1307
1310
case ttm_cached:
1308
1311
seq_puts(m, "\t:");