These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / subdev / fb / base.c
index 61fde43..a719b9b 100644 (file)
  * Authors: Ben Skeggs
  */
 #include "priv.h"
+#include "ram.h"
 
 #include <subdev/bios.h>
 #include <subdev/bios/M0203.h>
+#include <engine/gr.h>
+#include <engine/mpeg.h>
+
+bool
+nvkm_fb_memtype_valid(struct nvkm_fb *fb, u32 memtype)
+{
+       return fb->func->memtype_valid(fb, memtype);
+}
+
+void
+nvkm_fb_tile_fini(struct nvkm_fb *fb, int region, struct nvkm_fb_tile *tile)
+{
+       fb->func->tile.fini(fb, region, tile);
+}
+
+void
+nvkm_fb_tile_init(struct nvkm_fb *fb, int region, u32 addr, u32 size,
+                 u32 pitch, u32 flags, struct nvkm_fb_tile *tile)
+{
+       fb->func->tile.init(fb, region, addr, size, pitch, flags, tile);
+}
+
+void
+nvkm_fb_tile_prog(struct nvkm_fb *fb, int region, struct nvkm_fb_tile *tile)
+{
+       struct nvkm_device *device = fb->subdev.device;
+       if (fb->func->tile.prog) {
+               fb->func->tile.prog(fb, region, tile);
+               if (device->gr)
+                       nvkm_engine_tile(&device->gr->engine, region);
+               if (device->mpeg)
+                       nvkm_engine_tile(device->mpeg, region);
+       }
+}
 
 int
 nvkm_fb_bios_memtype(struct nvkm_bios *bios)
 {
-       const u8 ramcfg = (nv_rd32(bios, 0x101000) & 0x0000003c) >> 2;
+       struct nvkm_subdev *subdev = &bios->subdev;
+       struct nvkm_device *device = subdev->device;
+       const u8 ramcfg = (nvkm_rd32(device, 0x101000) & 0x0000003c) >> 2;
        struct nvbios_M0203E M0203E;
        u8 ver, hdr;
 
        if (nvbios_M0203Em(bios, ramcfg, &ver, &hdr, &M0203E)) {
                switch (M0203E.type) {
-               case M0203E_TYPE_DDR2 : return NV_MEM_TYPE_DDR2;
-               case M0203E_TYPE_DDR3 : return NV_MEM_TYPE_DDR3;
-               case M0203E_TYPE_GDDR3: return NV_MEM_TYPE_GDDR3;
-               case M0203E_TYPE_GDDR5: return NV_MEM_TYPE_GDDR5;
+               case M0203E_TYPE_DDR2 : return NVKM_RAM_TYPE_DDR2;
+               case M0203E_TYPE_DDR3 : return NVKM_RAM_TYPE_DDR3;
+               case M0203E_TYPE_GDDR3: return NVKM_RAM_TYPE_GDDR3;
+               case M0203E_TYPE_GDDR5: return NVKM_RAM_TYPE_GDDR5;
                default:
-                       nv_warn(bios, "M0203E type %02x\n", M0203E.type);
-                       return NV_MEM_TYPE_UNKNOWN;
+                       nvkm_warn(subdev, "M0203E type %02x\n", M0203E.type);
+                       return NVKM_RAM_TYPE_UNKNOWN;
                }
        }
 
-       nv_warn(bios, "M0203E not matched!\n");
-       return NV_MEM_TYPE_UNKNOWN;
+       nvkm_warn(subdev, "M0203E not matched!\n");
+       return NVKM_RAM_TYPE_UNKNOWN;
 }
 
-int
-_nvkm_fb_fini(struct nvkm_object *object, bool suspend)
+static void
+nvkm_fb_intr(struct nvkm_subdev *subdev)
 {
-       struct nvkm_fb *pfb = (void *)object;
-       int ret;
+       struct nvkm_fb *fb = nvkm_fb(subdev);
+       if (fb->func->intr)
+               fb->func->intr(fb);
+}
 
-       if (pfb->ram) {
-               ret = nv_ofuncs(pfb->ram)->fini(nv_object(pfb->ram), suspend);
-               if (ret && suspend)
+static int
+nvkm_fb_oneinit(struct nvkm_subdev *subdev)
+{
+       struct nvkm_fb *fb = nvkm_fb(subdev);
+       if (fb->func->ram_new) {
+               int ret = fb->func->ram_new(fb, &fb->ram);
+               if (ret) {
+                       nvkm_error(subdev, "vram setup failed, %d\n", ret);
                        return ret;
+               }
        }
-
-       return nvkm_subdev_fini(&pfb->base, suspend);
+       return 0;
 }
 
-int
-_nvkm_fb_init(struct nvkm_object *object)
+static int
+nvkm_fb_init(struct nvkm_subdev *subdev)
 {
-       struct nvkm_fb *pfb = (void *)object;
+       struct nvkm_fb *fb = nvkm_fb(subdev);
        int ret, i;
 
-       ret = nvkm_subdev_init(&pfb->base);
-       if (ret)
-               return ret;
-
-       if (pfb->ram) {
-               ret = nv_ofuncs(pfb->ram)->init(nv_object(pfb->ram));
+       if (fb->ram) {
+               ret = nvkm_ram_init(fb->ram);
                if (ret)
                        return ret;
        }
 
-       for (i = 0; i < pfb->tile.regions; i++)
-               pfb->tile.prog(pfb, i, &pfb->tile.region[i]);
+       for (i = 0; i < fb->tile.regions; i++)
+               fb->func->tile.prog(fb, i, &fb->tile.region[i]);
 
+       if (fb->func->init)
+               fb->func->init(fb);
        return 0;
 }
 
-void
-_nvkm_fb_dtor(struct nvkm_object *object)
+static void *
+nvkm_fb_dtor(struct nvkm_subdev *subdev)
 {
-       struct nvkm_fb *pfb = (void *)object;
+       struct nvkm_fb *fb = nvkm_fb(subdev);
        int i;
 
-       for (i = 0; i < pfb->tile.regions; i++)
-               pfb->tile.fini(pfb, i, &pfb->tile.region[i]);
-       nvkm_mm_fini(&pfb->tags);
+       for (i = 0; i < fb->tile.regions; i++)
+               fb->func->tile.fini(fb, i, &fb->tile.region[i]);
 
-       if (pfb->ram) {
-               nvkm_mm_fini(&pfb->vram);
-               nvkm_object_ref(NULL, (struct nvkm_object **)&pfb->ram);
-       }
+       nvkm_ram_del(&fb->ram);
 
-       nvkm_subdev_destroy(&pfb->base);
+       if (fb->func->dtor)
+               return fb->func->dtor(fb);
+       return fb;
 }
 
-int
-nvkm_fb_create_(struct nvkm_object *parent, struct nvkm_object *engine,
-               struct nvkm_oclass *oclass, int length, void **pobject)
-{
-       struct nvkm_fb_impl *impl = (void *)oclass;
-       static const char *name[] = {
-               [NV_MEM_TYPE_UNKNOWN] = "unknown",
-               [NV_MEM_TYPE_STOLEN ] = "stolen system memory",
-               [NV_MEM_TYPE_SGRAM  ] = "SGRAM",
-               [NV_MEM_TYPE_SDRAM  ] = "SDRAM",
-               [NV_MEM_TYPE_DDR1   ] = "DDR1",
-               [NV_MEM_TYPE_DDR2   ] = "DDR2",
-               [NV_MEM_TYPE_DDR3   ] = "DDR3",
-               [NV_MEM_TYPE_GDDR2  ] = "GDDR2",
-               [NV_MEM_TYPE_GDDR3  ] = "GDDR3",
-               [NV_MEM_TYPE_GDDR4  ] = "GDDR4",
-               [NV_MEM_TYPE_GDDR5  ] = "GDDR5",
-       };
-       struct nvkm_object *ram;
-       struct nvkm_fb *pfb;
-       int ret;
-
-       ret = nvkm_subdev_create_(parent, engine, oclass, 0, "PFB", "fb",
-                                 length, pobject);
-       pfb = *pobject;
-       if (ret)
-               return ret;
-
-       pfb->memtype_valid = impl->memtype;
-
-       if (!impl->ram)
-               return 0;
-
-       ret = nvkm_object_ctor(nv_object(pfb), NULL, impl->ram, NULL, 0, &ram);
-       if (ret) {
-               nv_fatal(pfb, "error detecting memory configuration!!\n");
-               return ret;
-       }
-
-       pfb->ram = (void *)ram;
+static const struct nvkm_subdev_func
+nvkm_fb = {
+       .dtor = nvkm_fb_dtor,
+       .oneinit = nvkm_fb_oneinit,
+       .init = nvkm_fb_init,
+       .intr = nvkm_fb_intr,
+};
 
-       if (!nvkm_mm_initialised(&pfb->vram)) {
-               ret = nvkm_mm_init(&pfb->vram, 0, pfb->ram->size >> 12, 1);
-               if (ret)
-                       return ret;
-       }
-
-       if (!nvkm_mm_initialised(&pfb->tags)) {
-               ret = nvkm_mm_init(&pfb->tags, 0, pfb->ram->tags ?
-                                  ++pfb->ram->tags : 0, 1);
-               if (ret)
-                       return ret;
-       }
+void
+nvkm_fb_ctor(const struct nvkm_fb_func *func, struct nvkm_device *device,
+            int index, struct nvkm_fb *fb)
+{
+       nvkm_subdev_ctor(&nvkm_fb, device, index, 0, &fb->subdev);
+       fb->func = func;
+       fb->tile.regions = fb->func->tile.regions;
+}
 
-       nv_info(pfb, "RAM type: %s\n", name[pfb->ram->type]);
-       nv_info(pfb, "RAM size: %d MiB\n", (int)(pfb->ram->size >> 20));
-       nv_info(pfb, "   ZCOMP: %d tags\n", pfb->ram->tags);
+int
+nvkm_fb_new_(const struct nvkm_fb_func *func, struct nvkm_device *device,
+            int index, struct nvkm_fb **pfb)
+{
+       if (!(*pfb = kzalloc(sizeof(**pfb), GFP_KERNEL)))
+               return -ENOMEM;
+       nvkm_fb_ctor(func, device, index, *pfb);
        return 0;
 }