These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / subdev / fb / ramnv20.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv20.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv20.c
index d9e7187..747e47c 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv20.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv20.c
@@ -21,42 +21,29 @@
  *
  * Authors: Ben Skeggs
  */
-#include "priv.h"
+#include "ram.h"
 
-static int
-nv20_ram_create(struct nvkm_object *parent, struct nvkm_object *engine,
-               struct nvkm_oclass *oclass, void *data, u32 size,
-               struct nvkm_object **pobject)
+int
+nv20_ram_new(struct nvkm_fb *fb, struct nvkm_ram **pram)
 {
-       struct nvkm_fb *pfb = nvkm_fb(parent);
-       struct nvkm_ram *ram;
-       u32 pbus1218 = nv_rd32(pfb, 0x001218);
+       struct nvkm_device *device = fb->subdev.device;
+       u32 pbus1218 =  nvkm_rd32(device, 0x001218);
+       u32     size = (nvkm_rd32(device, 0x10020c) & 0xff000000);
+       u32     tags =  nvkm_rd32(device, 0x100320);
+       enum nvkm_ram_type type = NVKM_RAM_TYPE_UNKNOWN;
        int ret;
 
-       ret = nvkm_ram_create(parent, engine, oclass, &ram);
-       *pobject = nv_object(ram);
+       switch (pbus1218 & 0x00000300) {
+       case 0x00000000: type = NVKM_RAM_TYPE_SDRAM; break;
+       case 0x00000100: type = NVKM_RAM_TYPE_DDR1 ; break;
+       case 0x00000200: type = NVKM_RAM_TYPE_GDDR3; break;
+       case 0x00000300: type = NVKM_RAM_TYPE_GDDR2; break;
+       }
+
+       ret = nvkm_ram_new_(&nv04_ram_func, fb, type, size, tags, pram);
        if (ret)
                return ret;
 
-       switch (pbus1218 & 0x00000300) {
-       case 0x00000000: ram->type = NV_MEM_TYPE_SDRAM; break;
-       case 0x00000100: ram->type = NV_MEM_TYPE_DDR1; break;
-       case 0x00000200: ram->type = NV_MEM_TYPE_GDDR3; break;
-       case 0x00000300: ram->type = NV_MEM_TYPE_GDDR2; break;
-       }
-       ram->size  = (nv_rd32(pfb, 0x10020c) & 0xff000000);
-       ram->parts = (nv_rd32(pfb, 0x100200) & 0x00000003) + 1;
-       ram->tags  = nv_rd32(pfb, 0x100320);
+       (*pram)->parts = (nvkm_rd32(device, 0x100200) & 0x00000003) + 1;
        return 0;
 }
-
-struct nvkm_oclass
-nv20_ram_oclass = {
-       .handle = 0,
-       .ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = nv20_ram_create,
-               .dtor = _nvkm_ram_dtor,
-               .init = _nvkm_ram_init,
-               .fini = _nvkm_ram_fini,
-       }
-};