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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c
index d51aa02..008bb98 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c
@@ -22,101 +22,90 @@
  * Authors: Ben Skeggs
  */
 #include "gf100.h"
-
-#include <core/device.h>
+#include "ram.h"
 
 extern const u8 gf100_pte_storage_type_map[256];
 
 bool
-gf100_fb_memtype_valid(struct nvkm_fb *pfb, u32 tile_flags)
+gf100_fb_memtype_valid(struct nvkm_fb *fb, u32 tile_flags)
 {
        u8 memtype = (tile_flags & 0x0000ff00) >> 8;
        return likely((gf100_pte_storage_type_map[memtype] != 0xff));
 }
 
-static void
-gf100_fb_intr(struct nvkm_subdev *subdev)
+void
+gf100_fb_intr(struct nvkm_fb *base)
 {
-       struct gf100_fb_priv *priv = (void *)subdev;
-       u32 intr = nv_rd32(priv, 0x000100);
-       if (intr & 0x08000000) {
-               nv_debug(priv, "PFFB intr\n");
-               intr &= ~0x08000000;
-       }
-       if (intr & 0x00002000) {
-               nv_debug(priv, "PBFB intr\n");
-               intr &= ~0x00002000;
-       }
+       struct gf100_fb *fb = gf100_fb(base);
+       struct nvkm_subdev *subdev = &fb->base.subdev;
+       struct nvkm_device *device = subdev->device;
+       u32 intr = nvkm_rd32(device, 0x000100);
+       if (intr & 0x08000000)
+               nvkm_debug(subdev, "PFFB intr\n");
+       if (intr & 0x00002000)
+               nvkm_debug(subdev, "PBFB intr\n");
 }
 
-int
-gf100_fb_init(struct nvkm_object *object)
+void
+gf100_fb_init(struct nvkm_fb *base)
 {
-       struct gf100_fb_priv *priv = (void *)object;
-       int ret;
+       struct gf100_fb *fb = gf100_fb(base);
+       struct nvkm_device *device = fb->base.subdev.device;
 
-       ret = nvkm_fb_init(&priv->base);
-       if (ret)
-               return ret;
+       if (fb->r100c10_page)
+               nvkm_wr32(device, 0x100c10, fb->r100c10 >> 8);
 
-       if (priv->r100c10_page)
-               nv_wr32(priv, 0x100c10, priv->r100c10 >> 8);
-
-       nv_mask(priv, 0x100c80, 0x00000001, 0x00000000); /* 128KiB lpg */
-       return 0;
+       nvkm_mask(device, 0x100c80, 0x00000001, 0x00000000); /* 128KiB lpg */
 }
 
-void
-gf100_fb_dtor(struct nvkm_object *object)
+void *
+gf100_fb_dtor(struct nvkm_fb *base)
 {
-       struct nvkm_device *device = nv_device(object);
-       struct gf100_fb_priv *priv = (void *)object;
+       struct gf100_fb *fb = gf100_fb(base);
+       struct nvkm_device *device = fb->base.subdev.device;
 
-       if (priv->r100c10_page) {
-               dma_unmap_page(nv_device_base(device), priv->r100c10, PAGE_SIZE,
+       if (fb->r100c10_page) {
+               dma_unmap_page(device->dev, fb->r100c10, PAGE_SIZE,
                               DMA_BIDIRECTIONAL);
-               __free_page(priv->r100c10_page);
+               __free_page(fb->r100c10_page);
        }
 
-       nvkm_fb_destroy(&priv->base);
+       return fb;
 }
 
 int
-gf100_fb_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
-             struct nvkm_oclass *oclass, void *data, u32 size,
-             struct nvkm_object **pobject)
+gf100_fb_new_(const struct nvkm_fb_func *func, struct nvkm_device *device,
+             int index, struct nvkm_fb **pfb)
 {
-       struct nvkm_device *device = nv_device(parent);
-       struct gf100_fb_priv *priv;
-       int ret;
-
-       ret = nvkm_fb_create(parent, engine, oclass, &priv);
-       *pobject = nv_object(priv);
-       if (ret)
-               return ret;
-
-       priv->r100c10_page = alloc_page(GFP_KERNEL | __GFP_ZERO);
-       if (priv->r100c10_page) {
-               priv->r100c10 = dma_map_page(nv_device_base(device),
-                                            priv->r100c10_page, 0, PAGE_SIZE,
-                                            DMA_BIDIRECTIONAL);
-               if (dma_mapping_error(nv_device_base(device), priv->r100c10))
+       struct gf100_fb *fb;
+
+       if (!(fb = kzalloc(sizeof(*fb), GFP_KERNEL)))
+               return -ENOMEM;
+       nvkm_fb_ctor(func, device, index, &fb->base);
+       *pfb = &fb->base;
+
+       fb->r100c10_page = alloc_page(GFP_KERNEL | __GFP_ZERO);
+       if (fb->r100c10_page) {
+               fb->r100c10 = dma_map_page(device->dev, fb->r100c10_page, 0,
+                                          PAGE_SIZE, DMA_BIDIRECTIONAL);
+               if (dma_mapping_error(device->dev, fb->r100c10))
                        return -EFAULT;
        }
 
-       nv_subdev(priv)->intr = gf100_fb_intr;
        return 0;
 }
 
-struct nvkm_oclass *
-gf100_fb_oclass = &(struct nvkm_fb_impl) {
-       .base.handle = NV_SUBDEV(FB, 0xc0),
-       .base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = gf100_fb_ctor,
-               .dtor = gf100_fb_dtor,
-               .init = gf100_fb_init,
-               .fini = _nvkm_fb_fini,
-       },
-       .memtype = gf100_fb_memtype_valid,
-       .ram = &gf100_ram_oclass,
-}.base;
+static const struct nvkm_fb_func
+gf100_fb = {
+       .dtor = gf100_fb_dtor,
+       .init = gf100_fb_init,
+       .intr = gf100_fb_intr,
+       .ram_new = gf100_ram_new,
+       .memtype_valid = gf100_fb_memtype_valid,
+};
+
+int
+gf100_fb_new(struct nvkm_device *device, int index, struct nvkm_fb **pfb)
+{
+       return gf100_fb_new_(&gf100_fb, device, index, pfb);
+}