Skip to content

Commit beb4c86

Browse files
drm/nouveau: switch the TTM backends to self alloc
Similar to the TTM range manager. Signed-off-by: Christian König <[email protected]> Reviewed-by: Matthew Auld <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 267501e commit beb4c86

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

drivers/gpu/drm/nouveau/nouveau_mem.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ nouveau_mem(struct ttm_resource *reg)
1313
}
1414

1515
struct nouveau_mem {
16+
struct ttm_resource base;
1617
struct nouveau_cli *cli;
1718
u8 kind;
1819
u8 comp;

drivers/gpu/drm/nouveau/nouveau_ttm.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ nouveau_vram_manager_new(struct ttm_resource_manager *man,
5858
if (ret)
5959
return ret;
6060

61+
ttm_resource_init(bo, place, reg->mm_node);
62+
6163
ret = nouveau_mem_vram(reg, nvbo->contig, nvbo->page);
6264
if (ret) {
6365
nouveau_mem_del(reg);
@@ -86,6 +88,7 @@ nouveau_gart_manager_new(struct ttm_resource_manager *man,
8688
if (ret)
8789
return ret;
8890

91+
ttm_resource_init(bo, place, reg->mm_node);
8992
reg->start = 0;
9093
return 0;
9194
}
@@ -111,6 +114,7 @@ nv04_gart_manager_new(struct ttm_resource_manager *man,
111114
if (ret)
112115
return ret;
113116

117+
ttm_resource_init(bo, place, reg->mm_node);
114118
ret = nvif_vmm_get(&mem->cli->vmm.vmm, PTES, false, 12, 0,
115119
(long)reg->num_pages << PAGE_SHIFT, &mem->vma[0]);
116120
if (ret) {

0 commit comments

Comments
 (0)