drm/nouveau/ltc/gf100-: allocate tagram with nvkm_ram_get()

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h
index 0e2751bbf153b585eaf80f6e73a1929caaf0cbb0..784661ae7e98248cfc932c59b2d9ae7241453c13 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h
@@ -14,7 +14,7 @@ struct nvkm_ltc {
 
        u32 num_tags;
        u32 tag_base;
-       struct nvkm_mm_node *tag_ram;
+       struct nvkm_memory *tag_ram;
 
        int zbc_min;
        int zbc_max;

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c
index f4aa81dd8978d971e411a2e548b51d9b9e2d3744..3bb97b1714356bbbd8015c218400396032c34385 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c
@@ -23,6 +23,7 @@
  */
 #include "priv.h"
 
+#include <core/memory.h>
 #include <subdev/fb.h>
 
 int
@@ -119,9 +120,7 @@ static void *
 nvkm_ltc_dtor(struct nvkm_subdev *subdev)
 {
        struct nvkm_ltc *ltc = nvkm_ltc(subdev);
-       struct nvkm_ram *ram = ltc->subdev.device->fb->ram;
-       if (ram)
-               nvkm_mm_free(&ram->vram, &ltc->tag_ram);
+       nvkm_memory_unref(&ltc->tag_ram);
        return ltc;
 }
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c
index 60a5e9e2b2643883db38641a5d2053d9c8cc7429..59acf568faeb2ef65a100440823557ed9bbb4acc 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c
@@ -23,6 +23,7 @@
  */
 #include "priv.h"
 
+#include <core/memory.h>
 #include <subdev/fb.h>
 #include <subdev/timer.h>
 
@@ -152,7 +153,8 @@ gf100_ltc_flush(struct nvkm_ltc *ltc)
 int
 gf100_ltc_oneinit_tag_ram(struct nvkm_ltc *ltc)
 {
-       struct nvkm_fb *fb = ltc->subdev.device->fb;
+       struct nvkm_device *device = ltc->subdev.device;
+       struct nvkm_fb *fb = device->fb;
        struct nvkm_ram *ram = fb->ram;
        u32 tag_size, tag_margin, tag_align;
        int ret;
@@ -182,14 +184,13 @@ gf100_ltc_oneinit_tag_ram(struct nvkm_ltc *ltc)
         */
        tag_size  = (ltc->num_tags / 64) * 0x6000 + tag_margin;
        tag_size += tag_align;
-       tag_size  = (tag_size + 0xfff) >> 12; /* round up */
 
-       ret = nvkm_mm_tail(&ram->vram, NVKM_RAM_MM_NORMAL, 1, tag_size,
-                          tag_size, 1, &ltc->tag_ram);
+       ret = nvkm_ram_get(device, NVKM_RAM_MM_NORMAL, 0x01, 12, tag_size,
+                          true, true, &ltc->tag_ram);
        if (ret) {
                ltc->num_tags = 0;
        } else {
-               u64 tag_base = ((u64)ltc->tag_ram->offset << 12) + tag_margin;
+               u64 tag_base = nvkm_memory_addr(ltc->tag_ram) + tag_margin;
 
                tag_base += tag_align - 1;
                do_div(tag_base, tag_align);