gr/gf104: rename gf104 (nvc4), it came before gf106 (nvc3)

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

12 files changed, 27 insertions, 27 deletions

diff --git a/drm/Kbuild b/drm/Kbuild
index a4a3dffc..4c5a61e4 100644
--- a/drm/Kbuild
+++ b/drm/Kbuild
@@ -249,7 +249,7 @@ nouveau-y += core/engine/graph/ctxnv40.o
 nouveau-y += core/engine/graph/ctxnv50.o
 nouveau-y += core/engine/graph/ctxnvc0.o
 nouveau-y += core/engine/graph/ctxnvc1.o
-nouveau-y += core/engine/graph/ctxnvc3.o
+nouveau-y += core/engine/graph/ctxnvc4.o
 nouveau-y += core/engine/graph/ctxnvc8.o
 nouveau-y += core/engine/graph/ctxnvd7.o
 nouveau-y += core/engine/graph/ctxnvd9.o
@@ -268,7 +268,7 @@ nouveau-y += core/engine/graph/nv40.o
 nouveau-y += core/engine/graph/nv50.o
 nouveau-y += core/engine/graph/nvc0.o
 nouveau-y += core/engine/graph/nvc1.o
-nouveau-y += core/engine/graph/nvc3.o
+nouveau-y += core/engine/graph/nvc4.o
 nouveau-y += core/engine/graph/nvc8.o
 nouveau-y += core/engine/graph/nvd7.o
 nouveau-y += core/engine/graph/nvd9.o
diff --git a/drm/core/engine/graph/ctxnvc3.c b/drm/core/engine/graph/ctxnvc3.c
deleted file mode 120000
index 91c311dc..00000000
--- a/drm/core/engine/graph/ctxnvc3.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../../nvkm/engine/graph/ctxnvc3.c
\ No newline at end of file
diff --git a/drm/core/engine/graph/ctxnvc4.c b/drm/core/engine/graph/ctxnvc4.c
new file mode 120000
index 00000000..0dada0f9
--- /dev/null
+++ b/drm/core/engine/graph/ctxnvc4.c
@@ -0,0 +1 @@
+../../../../nvkm/engine/graph/ctxnvc4.c
\ No newline at end of file
diff --git a/drm/core/engine/graph/nvc3.c b/drm/core/engine/graph/nvc3.c
deleted file mode 120000
index 10e77abd..00000000
--- a/drm/core/engine/graph/nvc3.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../../nvkm/engine/graph/nvc3.c
\ No newline at end of file
diff --git a/drm/core/engine/graph/nvc4.c b/drm/core/engine/graph/nvc4.c
new file mode 120000
index 00000000..6b257a61
--- /dev/null
+++ b/drm/core/engine/graph/nvc4.c
@@ -0,0 +1 @@
+../../../../nvkm/engine/graph/nvc4.c
\ No newline at end of file
diff --git a/nvkm/engine/device/nvc0.c b/nvkm/engine/device/nvc0.c
index 78f4bfd6..2075b302 100644
--- a/nvkm/engine/device/nvc0.c
+++ b/nvkm/engine/device/nvc0.c
@@ -112,7 +112,7 @@ nvc0_identify(struct nouveau_device *device)
 		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;
 		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;
 		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
-		device->oclass[NVDEV_ENGINE_GR     ] =  nvc3_graph_oclass;
+		device->oclass[NVDEV_ENGINE_GR     ] =  nvc4_graph_oclass;
 		device->oclass[NVDEV_ENGINE_VP     ] = &nvc0_vp_oclass;
 		device->oclass[NVDEV_ENGINE_BSP    ] = &nvc0_bsp_oclass;
 		device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;
@@ -144,7 +144,7 @@ nvc0_identify(struct nouveau_device *device)
 		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;
 		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;
 		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
-		device->oclass[NVDEV_ENGINE_GR     ] =  nvc3_graph_oclass;
+		device->oclass[NVDEV_ENGINE_GR     ] =  nvc4_graph_oclass;
 		device->oclass[NVDEV_ENGINE_VP     ] = &nvc0_vp_oclass;
 		device->oclass[NVDEV_ENGINE_BSP    ] = &nvc0_bsp_oclass;
 		device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;
@@ -175,7 +175,7 @@ nvc0_identify(struct nouveau_device *device)
 		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;
 		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;
 		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
-		device->oclass[NVDEV_ENGINE_GR     ] =  nvc3_graph_oclass;
+		device->oclass[NVDEV_ENGINE_GR     ] =  nvc4_graph_oclass;
 		device->oclass[NVDEV_ENGINE_VP     ] = &nvc0_vp_oclass;
 		device->oclass[NVDEV_ENGINE_BSP    ] = &nvc0_bsp_oclass;
 		device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;
@@ -207,7 +207,7 @@ nvc0_identify(struct nouveau_device *device)
 		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;
 		device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;
 		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
-		device->oclass[NVDEV_ENGINE_GR     ] =  nvc3_graph_oclass;
+		device->oclass[NVDEV_ENGINE_GR     ] =  nvc4_graph_oclass;
 		device->oclass[NVDEV_ENGINE_VP     ] = &nvc0_vp_oclass;
 		device->oclass[NVDEV_ENGINE_BSP    ] = &nvc0_bsp_oclass;
 		device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;
diff --git a/nvkm/engine/graph/Makefile.am b/nvkm/engine/graph/Makefile.am
index 359c7375..f7632497 100644
--- a/nvkm/engine/graph/Makefile.am
+++ b/nvkm/engine/graph/Makefile.am
@@ -17,7 +17,7 @@ libgraph_la_SOURCES = ${BUILT_SOURCES} \
 		      ctxnv50.c \
 		      ctxnvc0.c \
 		      ctxnvc1.c \
-		      ctxnvc3.c \
+		      ctxnvc4.c \
 		      ctxnvc8.c \
 		      ctxnvd7.c \
 		      ctxnvd9.c \
@@ -36,7 +36,7 @@ libgraph_la_SOURCES = ${BUILT_SOURCES} \
 		      nv50.c \
 		      nvc0.c \
 		      nvc1.c \
-		      nvc3.c \
+		      nvc4.c \
 		      nvc8.c \
 		      nvd7.c \
 		      nvd9.c \
diff --git a/nvkm/engine/graph/ctxnvc3.c b/nvkm/engine/graph/ctxnvc4.c
index 8f237b3b..d2734163 100644
--- a/nvkm/engine/graph/ctxnvc3.c
+++ b/nvkm/engine/graph/ctxnvc4.c
@@ -25,7 +25,7 @@
 #include "nvc0.h"
 
 static struct nvc0_graph_init
-nvc3_grctx_init_tpc[] = {
+nvc4_grctx_init_tpc[] = {
 	{ 0x419818,   1, 0x04, 0x00000000 },
 	{ 0x41983c,   1, 0x04, 0x00038bc7 },
 	{ 0x419848,   1, 0x04, 0x00000000 },
@@ -71,15 +71,15 @@ nvc3_grctx_init_tpc[] = {
 };
 
 struct nvc0_graph_init *
-nvc3_grctx_init_gpc[] = {
+nvc4_grctx_init_gpc[] = {
 	nvc0_grctx_init_gpc_0,
 	nvc0_grctx_init_gpc_1,
-	nvc3_grctx_init_tpc,
+	nvc4_grctx_init_tpc,
 	NULL
 };
 
 struct nouveau_oclass *
-nvc3_grctx_oclass = &(struct nvc0_grctx_oclass) {
+nvc4_grctx_oclass = &(struct nvc0_grctx_oclass) {
 	.base.handle = NV_ENGCTX(GR, 0xc3),
 	.base.ofuncs = &(struct nouveau_ofuncs) {
 		.ctor = nvc0_graph_context_ctor,
@@ -93,7 +93,7 @@ nvc3_grctx_oclass = &(struct nvc0_grctx_oclass) {
 	.mods = nvc0_grctx_generate_mods,
 	.unkn = nvc0_grctx_generate_unkn,
 	.hub  = nvc0_grctx_init_hub,
-	.gpc  = nvc3_grctx_init_gpc,
+	.gpc  = nvc4_grctx_init_gpc,
 	.icmd = nvc0_grctx_init_icmd,
 	.mthd = nvc0_grctx_init_mthd,
 }.base;
diff --git a/nvkm/engine/graph/nvc0.h b/nvkm/engine/graph/nvc0.h
index b0ab6de2..1335967f 100644
--- a/nvkm/engine/graph/nvc0.h
+++ b/nvkm/engine/graph/nvc0.h
@@ -196,7 +196,7 @@ extern struct nvc0_graph_init nvc0_graph_init_gpc[];
 extern struct nvc0_graph_init nvc0_graph_init_unk88xx[];
 extern struct nvc0_graph_init nvc0_graph_tpc_0[];
 
-extern struct nvc0_graph_init nvc3_graph_init_unk58xx[];
+extern struct nvc0_graph_init nvc4_graph_init_unk58xx[];
 
 extern struct nvc0_graph_init nvd9_graph_init_unk58xx[];
 extern struct nvc0_graph_init nvd9_graph_init_unk64xx[];
@@ -249,7 +249,7 @@ void nvc1_grctx_generate_unkn(struct nvc0_graph_priv *);
 extern struct nouveau_oclass *nvc1_grctx_oclass;
 extern struct nvc0_graph_init nvc1_grctx_init_9097[];
 
-extern struct nouveau_oclass *nvc3_grctx_oclass;
+extern struct nouveau_oclass *nvc4_grctx_oclass;
 
 extern struct nouveau_oclass *nvc8_grctx_oclass;
 extern struct nvc0_graph_init nvc8_grctx_init_9197[];
diff --git a/nvkm/engine/graph/nvc1.c b/nvkm/engine/graph/nvc1.c
index bc4a469b..26decd02 100644
--- a/nvkm/engine/graph/nvc1.c
+++ b/nvkm/engine/graph/nvc1.c
@@ -118,7 +118,7 @@ nvc1_graph_init_mmio[] = {
 	nvc0_graph_init_unk44xx,
 	nvc0_graph_init_unk78xx,
 	nvc0_graph_init_unk60xx,
-	nvc3_graph_init_unk58xx,
+	nvc4_graph_init_unk58xx,
 	nvc0_graph_init_unk80xx,
 	nvc1_graph_init_gpc,
 	nvc1_graph_init_tpc,
diff --git a/nvkm/engine/graph/nvc3.c b/nvkm/engine/graph/nvc4.c
index d44b3b3e..1c74d8e5 100644
--- a/nvkm/engine/graph/nvc3.c
+++ b/nvkm/engine/graph/nvc4.c
@@ -29,7 +29,7 @@
  ******************************************************************************/
 
 struct nvc0_graph_init
-nvc3_graph_init_unk58xx[] = {
+nvc4_graph_init_unk58xx[] = {
 	{ 0x405844,   1, 0x04, 0x00ffffff },
 	{ 0x405850,   1, 0x04, 0x00000000 },
 	{ 0x405900,   1, 0x04, 0x00002834 },
@@ -38,7 +38,7 @@ nvc3_graph_init_unk58xx[] = {
 };
 
 static struct nvc0_graph_init
-nvc3_graph_init_tpc[] = {
+nvc4_graph_init_tpc[] = {
 	{ 0x419d08,   2, 0x04, 0x00000000 },
 	{ 0x419d10,   1, 0x04, 0x00000014 },
 	{ 0x419ab0,   1, 0x04, 0x00000000 },
@@ -78,23 +78,23 @@ nvc3_graph_init_tpc[] = {
 };
 
 static struct nvc0_graph_init *
-nvc3_graph_init_mmio[] = {
+nvc4_graph_init_mmio[] = {
 	nvc0_graph_init_regs,
 	nvc0_graph_init_unk40xx,
 	nvc0_graph_init_unk44xx,
 	nvc0_graph_init_unk78xx,
 	nvc0_graph_init_unk60xx,
-	nvc3_graph_init_unk58xx,
+	nvc4_graph_init_unk58xx,
 	nvc0_graph_init_unk80xx,
 	nvc0_graph_init_gpc,
-	nvc3_graph_init_tpc,
+	nvc4_graph_init_tpc,
 	nvc0_graph_init_unk88xx,
 	nvc0_graph_tpc_0,
 	NULL
 };
 
 struct nouveau_oclass *
-nvc3_graph_oclass = &(struct nvc0_graph_oclass) {
+nvc4_graph_oclass = &(struct nvc0_graph_oclass) {
 	.base.handle = NV_ENGINE(GR, 0xc3),
 	.base.ofuncs = &(struct nouveau_ofuncs) {
 		.ctor = nvc0_graph_ctor,
@@ -102,9 +102,9 @@ nvc3_graph_oclass = &(struct nvc0_graph_oclass) {
 		.init = nvc0_graph_init,
 		.fini = _nouveau_graph_fini,
 	},
-	.cclass = &nvc3_grctx_oclass,
+	.cclass = &nvc4_grctx_oclass,
 	.sclass = nvc0_graph_sclass,
-	.mmio = nvc3_graph_init_mmio,
+	.mmio = nvc4_graph_init_mmio,
 	.fecs.ucode = &nvc0_graph_fecs_ucode,
 	.gpccs.ucode = &nvc0_graph_gpccs_ucode,
 }.base;
diff --git a/nvkm/include/engine/graph.h b/nvkm/include/engine/graph.h
index 97705618..05e34840 100644
--- a/nvkm/include/engine/graph.h
+++ b/nvkm/include/engine/graph.h
@@ -63,7 +63,7 @@ extern struct nouveau_oclass nv40_graph_oclass;
 extern struct nouveau_oclass nv50_graph_oclass;
 extern struct nouveau_oclass *nvc0_graph_oclass;
 extern struct nouveau_oclass *nvc1_graph_oclass;
-extern struct nouveau_oclass *nvc3_graph_oclass;
+extern struct nouveau_oclass *nvc4_graph_oclass;
 extern struct nouveau_oclass *nvc8_graph_oclass;
 extern struct nouveau_oclass *nvd7_graph_oclass;
 extern struct nouveau_oclass *nvd9_graph_oclass;