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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c
index abc18e8..0a0e44b 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c
@@ -21,81 +21,67 @@
  *
  * Authors: Ben Skeggs
  */
-#include "nv50.h"
+#define mcp77_ram(p) container_of((p), struct mcp77_ram, base)
+#include "ram.h"
 
-struct mcp77_ram_priv {
+struct mcp77_ram {
        struct nvkm_ram base;
        u64 poller_base;
 };
 
 static int
-mcp77_ram_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
-              struct nvkm_oclass *oclass, void *data, u32 datasize,
-              struct nvkm_object **pobject)
+mcp77_ram_init(struct nvkm_ram *base)
 {
-       u32 rsvd_head = ( 256 * 1024); /* vga memory */
-       u32 rsvd_tail = (1024 * 1024); /* vbios etc */
-       struct nvkm_fb *pfb = nvkm_fb(parent);
-       struct mcp77_ram_priv *priv;
-       int ret;
-
-       ret = nvkm_ram_create(parent, engine, oclass, &priv);
-       *pobject = nv_object(priv);
-       if (ret)
-               return ret;
-
-       priv->base.type   = NV_MEM_TYPE_STOLEN;
-       priv->base.stolen = (u64)nv_rd32(pfb, 0x100e10) << 12;
-       priv->base.size   = (u64)nv_rd32(pfb, 0x100e14) << 12;
+       struct mcp77_ram *ram = mcp77_ram(base);
+       struct nvkm_device *device = ram->base.fb->subdev.device;
+       u32 dniso  = ((ram->base.size - (ram->poller_base + 0x00)) >> 5) - 1;
+       u32 hostnb = ((ram->base.size - (ram->poller_base + 0x20)) >> 5) - 1;
+       u32 flush  = ((ram->base.size - (ram->poller_base + 0x40)) >> 5) - 1;
 
-       rsvd_tail += 0x1000;
-       priv->poller_base = priv->base.size - rsvd_tail;
-
-       ret = nvkm_mm_init(&pfb->vram, rsvd_head >> 12,
-                          (priv->base.size  - (rsvd_head + rsvd_tail)) >> 12,
-                          1);
-       if (ret)
-               return ret;
-
-       priv->base.get = nv50_ram_get;
-       priv->base.put = nv50_ram_put;
+       /* Enable NISO poller for various clients and set their associated
+        * read address, only for MCP77/78 and MCP79/7A. (fd#25701)
+        */
+       nvkm_wr32(device, 0x100c18, dniso);
+       nvkm_mask(device, 0x100c14, 0x00000000, 0x00000001);
+       nvkm_wr32(device, 0x100c1c, hostnb);
+       nvkm_mask(device, 0x100c14, 0x00000000, 0x00000002);
+       nvkm_wr32(device, 0x100c24, flush);
+       nvkm_mask(device, 0x100c14, 0x00000000, 0x00010000);
        return 0;
 }
 
-static int
-mcp77_ram_init(struct nvkm_object *object)
+static const struct nvkm_ram_func
+mcp77_ram_func = {
+       .init = mcp77_ram_init,
+       .get = nv50_ram_get,
+       .put = nv50_ram_put,
+};
+
+int
+mcp77_ram_new(struct nvkm_fb *fb, struct nvkm_ram **pram)
 {
-       struct nvkm_fb *pfb = nvkm_fb(object);
-       struct mcp77_ram_priv *priv = (void *)object;
+       struct nvkm_device *device = fb->subdev.device;
+       u32 rsvd_head = ( 256 * 1024); /* vga memory */
+       u32 rsvd_tail = (1024 * 1024) + 0x1000; /* vbios etc + poller mem */
+       u64 base = (u64)nvkm_rd32(device, 0x100e10) << 12;
+       u64 size = (u64)nvkm_rd32(device, 0x100e14) << 12;
+       struct mcp77_ram *ram;
        int ret;
-       u64 dniso, hostnb, flush;
 
-       ret = nvkm_ram_init(&priv->base);
+       if (!(ram = kzalloc(sizeof(*ram), GFP_KERNEL)))
+               return -ENOMEM;
+       *pram = &ram->base;
+
+       ret = nvkm_ram_ctor(&mcp77_ram_func, fb, NVKM_RAM_TYPE_STOLEN,
+                           size, 0, &ram->base);
        if (ret)
                return ret;
 
-       dniso  = ((priv->base.size - (priv->poller_base + 0x00)) >> 5) - 1;
-       hostnb = ((priv->base.size - (priv->poller_base + 0x20)) >> 5) - 1;
-       flush  = ((priv->base.size - (priv->poller_base + 0x40)) >> 5) - 1;
+       ram->poller_base = size - rsvd_tail;
+       ram->base.stolen = base;
+       nvkm_mm_fini(&ram->base.vram);
 
-       /* Enable NISO poller for various clients and set their associated
-        * read address, only for MCP77/78 and MCP79/7A. (fd#25701)
-        */
-       nv_wr32(pfb, 0x100c18, dniso);
-       nv_mask(pfb, 0x100c14, 0x00000000, 0x00000001);
-       nv_wr32(pfb, 0x100c1c, hostnb);
-       nv_mask(pfb, 0x100c14, 0x00000000, 0x00000002);
-       nv_wr32(pfb, 0x100c24, flush);
-       nv_mask(pfb, 0x100c14, 0x00000000, 0x00010000);
-       return 0;
+       return nvkm_mm_init(&ram->base.vram, rsvd_head >> NVKM_RAM_MM_SHIFT,
+                           (size - rsvd_head - rsvd_tail) >>
+                           NVKM_RAM_MM_SHIFT, 1);
 }
-
-struct nvkm_oclass
-mcp77_ram_oclass = {
-       .ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = mcp77_ram_ctor,
-               .dtor = _nvkm_ram_dtor,
-               .init = mcp77_ram_init,
-               .fini = _nvkm_ram_fini,
-       },
-};