drm/nouveau/devinit/tu102: rename implementation from tu104
authorBen Skeggs <bskeggs@redhat.com>
Thu, 17 Jan 2019 01:41:53 +0000 (11:41 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Tue, 19 Feb 2019 22:59:57 +0000 (08:59 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/Kbuild
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/tu102.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/tu104.c [deleted file]

index 1b71812a790bcd1ec8068e3233a014024a265fba..8ba982c2fdfb67a3970d6b9005c446a43d97fc35 100644 (file)
@@ -31,5 +31,5 @@ int gf100_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);
 int gm107_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);
 int gm200_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);
 int gv100_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);
-int tu104_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);
+int tu102_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);
 #endif
index d75fa76784834aab0bf46886d1a69fda89457efb..325c4c0ba274f716daab628ae3830102c6f80ebf 100644 (file)
@@ -2440,7 +2440,7 @@ nv162_chipset = {
        .bar = tu104_bar_new,
        .bios = nvkm_bios_new,
        .bus = gf100_bus_new,
-       .devinit = tu104_devinit_new,
+       .devinit = tu102_devinit_new,
        .fault = tu104_fault_new,
        .fb = gv100_fb_new,
        .fuse = gm107_fuse_new,
@@ -2472,7 +2472,7 @@ nv164_chipset = {
        .bar = tu104_bar_new,
        .bios = nvkm_bios_new,
        .bus = gf100_bus_new,
-       .devinit = tu104_devinit_new,
+       .devinit = tu102_devinit_new,
        .fault = tu104_fault_new,
        .fb = gv100_fb_new,
        .fuse = gm107_fuse_new,
@@ -2504,7 +2504,7 @@ nv166_chipset = {
        .bar = tu104_bar_new,
        .bios = nvkm_bios_new,
        .bus = gf100_bus_new,
-       .devinit = tu104_devinit_new,
+       .devinit = tu102_devinit_new,
        .fault = tu104_fault_new,
        .fb = gv100_fb_new,
        .fuse = gm107_fuse_new,
index 3ef505a5c01b20a99a695ca7d00bdd05d512fb1f..f3c388932b6ff4c55d9cb189f3c3f8094f08099e 100644 (file)
@@ -13,4 +13,4 @@ nvkm-y += nvkm/subdev/devinit/gf100.o
 nvkm-y += nvkm/subdev/devinit/gm107.o
 nvkm-y += nvkm/subdev/devinit/gm200.o
 nvkm-y += nvkm/subdev/devinit/gv100.o
-nvkm-y += nvkm/subdev/devinit/tu104.o
+nvkm-y += nvkm/subdev/devinit/tu102.o
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/tu102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/tu102.c
new file mode 100644 (file)
index 0000000..397670e
--- /dev/null
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2018 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include "nv50.h"
+
+#include <subdev/bios.h>
+#include <subdev/bios/pll.h>
+#include <subdev/clk/pll.h>
+
+static int
+tu102_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)
+{
+       struct nvkm_subdev *subdev = &init->subdev;
+       struct nvkm_device *device = subdev->device;
+       struct nvbios_pll info;
+       int head = type - PLL_VPLL0;
+       int N, fN, M, P;
+       int ret;
+
+       ret = nvbios_pll_parse(device->bios, type, &info);
+       if (ret)
+               return ret;
+
+       ret = gt215_pll_calc(subdev, &info, freq, &N, &fN, &M, &P);
+       if (ret < 0)
+               return ret;
+
+       switch (info.type) {
+       case PLL_VPLL0:
+       case PLL_VPLL1:
+       case PLL_VPLL2:
+       case PLL_VPLL3:
+               nvkm_wr32(device, 0x00ef10 + (head * 0x40), fN << 16);
+               nvkm_wr32(device, 0x00ef04 + (head * 0x40), (P << 16) |
+                                                           (N <<  8) |
+                                                           (M <<  0));
+               /*XXX*/
+               nvkm_wr32(device, 0x00ef0c + (head * 0x40), 0x00000900);
+               nvkm_wr32(device, 0x00ef00 + (head * 0x40), 0x02000014);
+               break;
+       default:
+               nvkm_warn(subdev, "%08x/%dKhz unimplemented\n", type, freq);
+               ret = -EINVAL;
+               break;
+       }
+
+       return ret;
+}
+
+static int
+tu102_devinit_post(struct nvkm_devinit *base, bool post)
+{
+       struct nv50_devinit *init = nv50_devinit(base);
+       gm200_devinit_preos(init, post);
+       return 0;
+}
+
+static const struct nvkm_devinit_func
+tu102_devinit = {
+       .init = nv50_devinit_init,
+       .post = tu102_devinit_post,
+       .pll_set = tu102_devinit_pll_set,
+       .disable = gm107_devinit_disable,
+};
+
+int
+tu102_devinit_new(struct nvkm_device *device, int index,
+               struct nvkm_devinit **pinit)
+{
+       return nv50_devinit_new_(&tu102_devinit, device, index, pinit);
+}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/tu104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/tu104.c
deleted file mode 100644 (file)
index aae87b3..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2018 Red Hat Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nv50.h"
-
-#include <subdev/bios.h>
-#include <subdev/bios/pll.h>
-#include <subdev/clk/pll.h>
-
-static int
-tu104_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)
-{
-       struct nvkm_subdev *subdev = &init->subdev;
-       struct nvkm_device *device = subdev->device;
-       struct nvbios_pll info;
-       int head = type - PLL_VPLL0;
-       int N, fN, M, P;
-       int ret;
-
-       ret = nvbios_pll_parse(device->bios, type, &info);
-       if (ret)
-               return ret;
-
-       ret = gt215_pll_calc(subdev, &info, freq, &N, &fN, &M, &P);
-       if (ret < 0)
-               return ret;
-
-       switch (info.type) {
-       case PLL_VPLL0:
-       case PLL_VPLL1:
-       case PLL_VPLL2:
-       case PLL_VPLL3:
-               nvkm_wr32(device, 0x00ef10 + (head * 0x40), fN << 16);
-               nvkm_wr32(device, 0x00ef04 + (head * 0x40), (P << 16) |
-                                                           (N <<  8) |
-                                                           (M <<  0));
-               /*XXX*/
-               nvkm_wr32(device, 0x00ef0c + (head * 0x40), 0x00000900);
-               nvkm_wr32(device, 0x00ef00 + (head * 0x40), 0x02000014);
-               break;
-       default:
-               nvkm_warn(subdev, "%08x/%dKhz unimplemented\n", type, freq);
-               ret = -EINVAL;
-               break;
-       }
-
-       return ret;
-}
-
-static int
-tu104_devinit_post(struct nvkm_devinit *base, bool post)
-{
-       struct nv50_devinit *init = nv50_devinit(base);
-       gm200_devinit_preos(init, post);
-       return 0;
-}
-
-static const struct nvkm_devinit_func
-tu104_devinit = {
-       .init = nv50_devinit_init,
-       .post = tu104_devinit_post,
-       .pll_set = tu104_devinit_pll_set,
-       .disable = gm107_devinit_disable,
-};
-
-int
-tu104_devinit_new(struct nvkm_device *device, int index,
-               struct nvkm_devinit **pinit)
-{
-       return nv50_devinit_new_(&tu104_devinit, device, index, pinit);
-}