openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau/ltc: init comptag mm in fb subdev 

A single location for the MM allows us to share allocation logic.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2017-11-01 03:56:19 +10:00
parent b1e839f3b3
commit 6cd7670c1e
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h
View File

@ -14,7 +14,6 @@ struct nvkm_ltc {
u32 num_tags; u32 num_tags;
u32 tag_base; u32 tag_base;
struct nvkm_mm tags;
struct nvkm_mm_node *tag_ram; struct nvkm_mm_node *tag_ram;
int zbc_min; int zbc_min;

7
drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c
View File

@ -28,7 +28,8 @@
int int
nvkm_ltc_tags_alloc(struct nvkm_ltc *ltc, u32 n, struct nvkm_mm_node **pnode) nvkm_ltc_tags_alloc(struct nvkm_ltc *ltc, u32 n, struct nvkm_mm_node **pnode)
{ {
int ret = nvkm_mm_head(&ltc->tags, 0, 1, n, n, 1, pnode); struct nvkm_fb *fb = ltc->subdev.device->fb;
int ret = nvkm_mm_head(&fb->tags, 0, 1, n, n, 1, pnode);
if (ret) if (ret)
*pnode = NULL; *pnode = NULL;
return ret; return ret;
@ -37,7 +38,8 @@ nvkm_ltc_tags_alloc(struct nvkm_ltc *ltc, u32 n, struct nvkm_mm_node **pnode)
void void
nvkm_ltc_tags_free(struct nvkm_ltc *ltc, struct nvkm_mm_node **pnode) nvkm_ltc_tags_free(struct nvkm_ltc *ltc, struct nvkm_mm_node **pnode)
{ {
nvkm_mm_free(&ltc->tags, pnode); struct nvkm_fb *fb = ltc->subdev.device->fb;
nvkm_mm_free(&fb->tags, pnode);
} }
void void
@ -118,7 +120,6 @@ nvkm_ltc_dtor(struct nvkm_subdev *subdev)
{ {
struct nvkm_ltc *ltc = nvkm_ltc(subdev); struct nvkm_ltc *ltc = nvkm_ltc(subdev);
struct nvkm_ram *ram = ltc->subdev.device->fb->ram; struct nvkm_ram *ram = ltc->subdev.device->fb->ram;
nvkm_mm_fini(&ltc->tags);
if (ram) if (ram)
nvkm_mm_free(&ram->vram, &ltc->tag_ram); nvkm_mm_free(&ram->vram, &ltc->tag_ram);
return ltc; return ltc;

6
drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c
View File

@ -152,7 +152,8 @@ gf100_ltc_flush(struct nvkm_ltc *ltc)
int int
gf100_ltc_oneinit_tag_ram(struct nvkm_ltc *ltc) gf100_ltc_oneinit_tag_ram(struct nvkm_ltc *ltc)
{ {
struct nvkm_ram *ram = ltc->subdev.device->fb->ram; struct nvkm_fb *fb = ltc->subdev.device->fb;
struct nvkm_ram *ram = fb->ram;
u32 tag_size, tag_margin, tag_align; u32 tag_size, tag_margin, tag_align;
int ret; int ret;
@ -197,7 +198,8 @@ gf100_ltc_oneinit_tag_ram(struct nvkm_ltc *ltc)
} }
mm_init: mm_init:
return nvkm_mm_init(&ltc->tags, 0, 0, ltc->num_tags, 1); nvkm_mm_fini(&fb->tags);
return nvkm_mm_init(&fb->tags, 0, 0, ltc->num_tags, 1);
} }
int int

2
drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp100.c
View File

@ -45,7 +45,7 @@ gp100_ltc_oneinit(struct nvkm_ltc *ltc)
ltc->ltc_nr = nvkm_rd32(device, 0x12006c); ltc->ltc_nr = nvkm_rd32(device, 0x12006c);
ltc->lts_nr = nvkm_rd32(device, 0x17e280) >> 28; ltc->lts_nr = nvkm_rd32(device, 0x17e280) >> 28;
/*XXX: tagram allocation - TBD */ /*XXX: tagram allocation - TBD */
return nvkm_mm_init(&ltc->tags, 0, 0, 0, 1); return 0;
} }
static void static void