These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / subdev / ibus / gk104.c
index 7b6e9a6..ba33609 100644 (file)
  */
 #include <subdev/ibus.h>
 
-struct gk104_ibus_priv {
-       struct nvkm_ibus base;
-};
-
 static void
-gk104_ibus_intr_hub(struct gk104_ibus_priv *priv, int i)
+gk104_ibus_intr_hub(struct nvkm_subdev *ibus, int i)
 {
-       u32 addr = nv_rd32(priv, 0x122120 + (i * 0x0800));
-       u32 data = nv_rd32(priv, 0x122124 + (i * 0x0800));
-       u32 stat = nv_rd32(priv, 0x122128 + (i * 0x0800));
-       nv_error(priv, "HUB%d: 0x%06x 0x%08x (0x%08x)\n", i, addr, data, stat);
-       nv_mask(priv, 0x122128 + (i * 0x0800), 0x00000200, 0x00000000);
+       struct nvkm_device *device = ibus->device;
+       u32 addr = nvkm_rd32(device, 0x122120 + (i * 0x0800));
+       u32 data = nvkm_rd32(device, 0x122124 + (i * 0x0800));
+       u32 stat = nvkm_rd32(device, 0x122128 + (i * 0x0800));
+       nvkm_error(ibus, "HUB%d: %06x %08x (%08x)\n", i, addr, data, stat);
+       nvkm_mask(device, 0x122128 + (i * 0x0800), 0x00000200, 0x00000000);
 }
 
 static void
-gk104_ibus_intr_rop(struct gk104_ibus_priv *priv, int i)
+gk104_ibus_intr_rop(struct nvkm_subdev *ibus, int i)
 {
-       u32 addr = nv_rd32(priv, 0x124120 + (i * 0x0800));
-       u32 data = nv_rd32(priv, 0x124124 + (i * 0x0800));
-       u32 stat = nv_rd32(priv, 0x124128 + (i * 0x0800));
-       nv_error(priv, "ROP%d: 0x%06x 0x%08x (0x%08x)\n", i, addr, data, stat);
-       nv_mask(priv, 0x124128 + (i * 0x0800), 0x00000200, 0x00000000);
+       struct nvkm_device *device = ibus->device;
+       u32 addr = nvkm_rd32(device, 0x124120 + (i * 0x0800));
+       u32 data = nvkm_rd32(device, 0x124124 + (i * 0x0800));
+       u32 stat = nvkm_rd32(device, 0x124128 + (i * 0x0800));
+       nvkm_error(ibus, "ROP%d: %06x %08x (%08x)\n", i, addr, data, stat);
+       nvkm_mask(device, 0x124128 + (i * 0x0800), 0x00000200, 0x00000000);
 }
 
 static void
-gk104_ibus_intr_gpc(struct gk104_ibus_priv *priv, int i)
+gk104_ibus_intr_gpc(struct nvkm_subdev *ibus, int i)
 {
-       u32 addr = nv_rd32(priv, 0x128120 + (i * 0x0800));
-       u32 data = nv_rd32(priv, 0x128124 + (i * 0x0800));
-       u32 stat = nv_rd32(priv, 0x128128 + (i * 0x0800));
-       nv_error(priv, "GPC%d: 0x%06x 0x%08x (0x%08x)\n", i, addr, data, stat);
-       nv_mask(priv, 0x128128 + (i * 0x0800), 0x00000200, 0x00000000);
+       struct nvkm_device *device = ibus->device;
+       u32 addr = nvkm_rd32(device, 0x128120 + (i * 0x0800));
+       u32 data = nvkm_rd32(device, 0x128124 + (i * 0x0800));
+       u32 stat = nvkm_rd32(device, 0x128128 + (i * 0x0800));
+       nvkm_error(ibus, "GPC%d: %06x %08x (%08x)\n", i, addr, data, stat);
+       nvkm_mask(device, 0x128128 + (i * 0x0800), 0x00000200, 0x00000000);
 }
 
 static void
-gk104_ibus_intr(struct nvkm_subdev *subdev)
+gk104_ibus_intr(struct nvkm_subdev *ibus)
 {
-       struct gk104_ibus_priv *priv = (void *)subdev;
-       u32 intr0 = nv_rd32(priv, 0x120058);
-       u32 intr1 = nv_rd32(priv, 0x12005c);
-       u32 hubnr = nv_rd32(priv, 0x120070);
-       u32 ropnr = nv_rd32(priv, 0x120074);
-       u32 gpcnr = nv_rd32(priv, 0x120078);
+       struct nvkm_device *device = ibus->device;
+       u32 intr0 = nvkm_rd32(device, 0x120058);
+       u32 intr1 = nvkm_rd32(device, 0x12005c);
+       u32 hubnr = nvkm_rd32(device, 0x120070);
+       u32 ropnr = nvkm_rd32(device, 0x120074);
+       u32 gpcnr = nvkm_rd32(device, 0x120078);
        u32 i;
 
        for (i = 0; (intr0 & 0x0000ff00) && i < hubnr; i++) {
                u32 stat = 0x00000100 << i;
                if (intr0 & stat) {
-                       gk104_ibus_intr_hub(priv, i);
+                       gk104_ibus_intr_hub(ibus, i);
                        intr0 &= ~stat;
                }
        }
@@ -79,7 +78,7 @@ gk104_ibus_intr(struct nvkm_subdev *subdev)
        for (i = 0; (intr0 & 0xffff0000) && i < ropnr; i++) {
                u32 stat = 0x00010000 << i;
                if (intr0 & stat) {
-                       gk104_ibus_intr_rop(priv, i);
+                       gk104_ibus_intr_rop(ibus, i);
                        intr0 &= ~stat;
                }
        }
@@ -87,53 +86,40 @@ gk104_ibus_intr(struct nvkm_subdev *subdev)
        for (i = 0; intr1 && i < gpcnr; i++) {
                u32 stat = 0x00000001 << i;
                if (intr1 & stat) {
-                       gk104_ibus_intr_gpc(priv, i);
+                       gk104_ibus_intr_gpc(ibus, i);
                        intr1 &= ~stat;
                }
        }
 }
 
 static int
-gk104_ibus_init(struct nvkm_object *object)
+gk104_ibus_init(struct nvkm_subdev *ibus)
 {
-       struct gk104_ibus_priv *priv = (void *)object;
-       int ret = nvkm_ibus_init(&priv->base);
-       if (ret == 0) {
-               nv_mask(priv, 0x122318, 0x0003ffff, 0x00001000);
-               nv_mask(priv, 0x12231c, 0x0003ffff, 0x00000200);
-               nv_mask(priv, 0x122310, 0x0003ffff, 0x00000800);
-               nv_mask(priv, 0x122348, 0x0003ffff, 0x00000100);
-               nv_mask(priv, 0x1223b0, 0x0003ffff, 0x00000fff);
-               nv_mask(priv, 0x122348, 0x0003ffff, 0x00000200);
-               nv_mask(priv, 0x122358, 0x0003ffff, 0x00002880);
-       }
-       return ret;
+       struct nvkm_device *device = ibus->device;
+       nvkm_mask(device, 0x122318, 0x0003ffff, 0x00001000);
+       nvkm_mask(device, 0x12231c, 0x0003ffff, 0x00000200);
+       nvkm_mask(device, 0x122310, 0x0003ffff, 0x00000800);
+       nvkm_mask(device, 0x122348, 0x0003ffff, 0x00000100);
+       nvkm_mask(device, 0x1223b0, 0x0003ffff, 0x00000fff);
+       nvkm_mask(device, 0x122348, 0x0003ffff, 0x00000200);
+       nvkm_mask(device, 0x122358, 0x0003ffff, 0x00002880);
+       return 0;
 }
 
-static int
-gk104_ibus_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
-               struct nvkm_oclass *oclass, void *data, u32 size,
-               struct nvkm_object **pobject)
-{
-       struct gk104_ibus_priv *priv;
-       int ret;
-
-       ret = nvkm_ibus_create(parent, engine, oclass, &priv);
-       *pobject = nv_object(priv);
-       if (ret)
-               return ret;
+static const struct nvkm_subdev_func
+gk104_ibus = {
+       .preinit = gk104_ibus_init,
+       .init = gk104_ibus_init,
+       .intr = gk104_ibus_intr,
+};
 
-       nv_subdev(priv)->intr = gk104_ibus_intr;
+int
+gk104_ibus_new(struct nvkm_device *device, int index,
+              struct nvkm_subdev **pibus)
+{
+       struct nvkm_subdev *ibus;
+       if (!(ibus = *pibus = kzalloc(sizeof(*ibus), GFP_KERNEL)))
+               return -ENOMEM;
+       nvkm_subdev_ctor(&gk104_ibus, device, index, 0, ibus);
        return 0;
 }
-
-struct nvkm_oclass
-gk104_ibus_oclass = {
-       .handle = NV_SUBDEV(IBUS, 0xe0),
-       .ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = gk104_ibus_ctor,
-               .dtor = _nvkm_ibus_dtor,
-               .init = gk104_ibus_init,
-               .fini = _nvkm_ibus_fini,
-       },
-};