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

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

diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
index a4a3dffce1059c1c53d3b75a6ab825eda2a95ac2..4c5a61e4277f31d482b31a775ac7af18a20ea4a7 100644 (file)
--- a/drivers/gpu/drm/nouveau/Makefile
+++ b/drivers/gpu/drm/nouveau/Makefile
@@ -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/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c
index 78f4bfd6686fe04bef5fd6e3840134beda3b2b23..2075b3027052c349f7b714036c2cf358d43871ae 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/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/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc3.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc4.c
similarity index 95%
rename from drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc3.c
rename to drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc4.c
index 8f237b3bd8c62f79f01004c36061ecf7d8c1f27b..d2734163cae944b3e261e452607f9c9ff7819246 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc3.c
+++ b/drivers/gpu/drm/nouveau/core/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/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h
index b0ab6de270b2ea9d148b483b8249bc11efa27496..1335967fbe7472e1ceb7a3d095e9209a04fee436 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h
+++ b/drivers/gpu/drm/nouveau/core/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/drivers/gpu/drm/nouveau/core/engine/graph/nvc1.c b/drivers/gpu/drm/nouveau/core/engine/graph/nvc1.c
index bc4a469b86cb98538e8411f9e5d628a781e079d7..26decd028f7504a623684fb02f3824dcd3555db4 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc1.c
+++ b/drivers/gpu/drm/nouveau/core/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/drivers/gpu/drm/nouveau/core/engine/graph/nvc3.c b/drivers/gpu/drm/nouveau/core/engine/graph/nvc4.c
similarity index 93%
rename from drivers/gpu/drm/nouveau/core/engine/graph/nvc3.c
rename to drivers/gpu/drm/nouveau/core/engine/graph/nvc4.c
index d44b3b3ee80026606bb0643486f369b6c7f592d3..1c74d8e5d7ee131bfcd498fc41d4c332f35cab2c 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc3.c
+++ b/drivers/gpu/drm/nouveau/core/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/drivers/gpu/drm/nouveau/core/include/engine/graph.h b/drivers/gpu/drm/nouveau/core/include/engine/graph.h
index 97705618de979e9fe1f810ca3ee5f557d5dd19e2..05e34840e6e338676c182da0f50bfd4dd1df8a68 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/include/engine/graph.h
+++ b/drivers/gpu/drm/nouveau/core/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;