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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c
index fbae05d..3c6a871 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c
@@ -21,33 +21,21 @@
  *
  * Authors: Ben Skeggs
  */
-#include "priv.h"
+#include "ram.h"
 
-#include <core/device.h>
-
-static int
-nv1a_ram_create(struct nvkm_object *parent, struct nvkm_object *engine,
-               struct nvkm_oclass *oclass, void *data, u32 size,
-               struct nvkm_object **pobject)
+int
+nv1a_ram_new(struct nvkm_fb *fb, struct nvkm_ram **pram)
 {
-       struct nvkm_fb *pfb = nvkm_fb(parent);
-       struct nvkm_ram *ram;
        struct pci_dev *bridge;
        u32 mem, mib;
-       int ret;
 
        bridge = pci_get_bus_and_slot(0, PCI_DEVFN(0, 1));
        if (!bridge) {
-               nv_fatal(pfb, "no bridge device\n");
+               nvkm_error(&fb->subdev, "no bridge device\n");
                return -ENODEV;
        }
 
-       ret = nvkm_ram_create(parent, engine, oclass, &ram);
-       *pobject = nv_object(ram);
-       if (ret)
-               return ret;
-
-       if (nv_device(pfb)->chipset == 0x1a) {
+       if (fb->subdev.device->chipset == 0x1a) {
                pci_read_config_dword(bridge, 0x7c, &mem);
                mib = ((mem >> 6) & 31) + 1;
        } else {
@@ -55,18 +43,6 @@ nv1a_ram_create(struct nvkm_object *parent, struct nvkm_object *engine,
                mib = ((mem >> 4) & 127) + 1;
        }
 
-       ram->type = NV_MEM_TYPE_STOLEN;
-       ram->size = mib * 1024 * 1024;
-       return 0;
+       return nvkm_ram_new_(&nv04_ram_func, fb, NVKM_RAM_TYPE_STOLEN,
+                            mib * 1024 * 1024, 0, pram);
 }
-
-struct nvkm_oclass
-nv1a_ram_oclass = {
-       .handle = 0,
-       .ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = nv1a_ram_create,
-               .dtor = _nvkm_ram_dtor,
-               .init = _nvkm_ram_init,
-               .fini = _nvkm_ram_fini,
-       }
-};