diff options
| author | Dave Airlie <airlied@redhat.com> | 2026-02-24 12:06:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2026-04-08 06:52:47 +1000 |
| commit | c21066ef697bbecc49dd7888bf8f4e7c684a8ef9 (patch) | |
| tree | 1ca6ce66d520db2d0c4d70bbba649e5480c4b3f4 /drivers | |
| parent | 444e2a19d7fd1f08044a68fbd8b37721c6531565 (diff) | |
| download | lwn-c21066ef697bbecc49dd7888bf8f4e7c684a8ef9.tar.gz lwn-c21066ef697bbecc49dd7888bf8f4e7c684a8ef9.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_pool.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.c index b2e3d48e237b..f50d9ff08193 100644 --- a/drivers/gpu/drm/ttm/ttm_pool.c +++ b/drivers/gpu/drm/ttm/ttm_pool.c @@ -406,17 +406,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 (ttm_pool_uses_dma32(pool)) 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 (ttm_pool_uses_dma32(pool)) return &global_dma32_uncached[order]; @@ -1294,7 +1288,7 @@ int ttm_pool_debugfs(struct ttm_pool *pool, struct seq_file *m) { unsigned int i; - if (!ttm_pool_uses_dma_alloc(pool) && pool->nid == NUMA_NO_NODE) { + if (!ttm_pool_uses_dma_alloc(pool)) { seq_puts(m, "unused\n"); return 0; } @@ -1305,10 +1299,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 (ttm_pool_uses_dma_alloc(pool)) - 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:"); |