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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv04.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv04.c
index 855de16..6f053a0 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv04.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv04.c
@@ -21,59 +21,45 @@
  *
  * Authors: Ben Skeggs
  */
-#include "priv.h"
+#include "ram.h"
 #include "regsnv04.h"
 
-static int
-nv04_ram_create(struct nvkm_object *parent, struct nvkm_object *engine,
-               struct nvkm_oclass *oclass, void *data, u32 size,
-               struct nvkm_object **pobject)
-{
-       struct nvkm_fb *pfb = nvkm_fb(parent);
-       struct nvkm_ram *ram;
-       u32 boot0 = nv_rd32(pfb, NV04_PFB_BOOT_0);
-       int ret;
+const struct nvkm_ram_func
+nv04_ram_func = {
+};
 
-       ret = nvkm_ram_create(parent, engine, oclass, &ram);
-       *pobject = nv_object(ram);
-       if (ret)
-               return ret;
+int
+nv04_ram_new(struct nvkm_fb *fb, struct nvkm_ram **pram)
+{
+       struct nvkm_device *device = fb->subdev.device;
+       u32 boot0 = nvkm_rd32(device, NV04_PFB_BOOT_0);
+       u64 size;
+       enum nvkm_ram_type type;
 
        if (boot0 & 0x00000100) {
-               ram->size  = ((boot0 >> 12) & 0xf) * 2 + 2;
-               ram->size *= 1024 * 1024;
+               size  = ((boot0 >> 12) & 0xf) * 2 + 2;
+               size *= 1024 * 1024;
        } else {
                switch (boot0 & NV04_PFB_BOOT_0_RAM_AMOUNT) {
                case NV04_PFB_BOOT_0_RAM_AMOUNT_32MB:
-                       ram->size = 32 * 1024 * 1024;
+                       size = 32 * 1024 * 1024;
                        break;
                case NV04_PFB_BOOT_0_RAM_AMOUNT_16MB:
-                       ram->size = 16 * 1024 * 1024;
+                       size = 16 * 1024 * 1024;
                        break;
                case NV04_PFB_BOOT_0_RAM_AMOUNT_8MB:
-                       ram->size = 8 * 1024 * 1024;
+                       size = 8 * 1024 * 1024;
                        break;
                case NV04_PFB_BOOT_0_RAM_AMOUNT_4MB:
-                       ram->size = 4 * 1024 * 1024;
+                       size = 4 * 1024 * 1024;
                        break;
                }
        }
 
        if ((boot0 & 0x00000038) <= 0x10)
-               ram->type = NV_MEM_TYPE_SGRAM;
+               type = NVKM_RAM_TYPE_SGRAM;
        else
-               ram->type = NV_MEM_TYPE_SDRAM;
+               type = NVKM_RAM_TYPE_SDRAM;
 
-       return 0;
+       return nvkm_ram_new_(&nv04_ram_func, fb, type, size, 0, pram);
 }
-
-struct nvkm_oclass
-nv04_ram_oclass = {
-       .handle = 0,
-       .ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = nv04_ram_create,
-               .dtor = _nvkm_ram_dtor,
-               .init = _nvkm_ram_init,
-               .fini = _nvkm_ram_fini,
-       }
-};