drm/nouveau/gr/gf100-: add symbolic names for classes

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

diff --git a/drivers/gpu/drm/nouveau/include/nvif/class.h b/drivers/gpu/drm/nouveau/include/nvif/class.h
index 5ad17fc36ae30ed998aa72ca7a3a1fb399e0c56d..67f1d9bd3403902e99646754465df2e2845d6a38 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/class.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/class.h
@@ -12,6 +12,13 @@
 #define NV_DMA_TO_MEMORY                                             0x00000003
 #define NV_DMA_IN_MEMORY                                             0x0000003d
 
+#define FERMI_TWOD_A                                                 0x0000902d
+
+#define FERMI_MEMORY_TO_MEMORY_FORMAT_A                              0x0000903d
+
+#define KEPLER_INLINE_TO_MEMORY_A                                    0x0000a040
+#define KEPLER_INLINE_TO_MEMORY_B                                    0x0000a140
+
 #define NV04_DISP                                                    0x00000046
 
 #define NV03_CHANNEL_DMA                                             0x0000006b

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
index 86c9515018d07c72f007c1f411ba7e0401937ed5..3f05414c077ca3afffe106075dad10abd4fc7904 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -260,8 +260,8 @@ gf100_gr_90c0_omthds[] = {
 
 struct nvkm_oclass
 gf100_gr_sclass[] = {
-       { 0x902d, &nvkm_object_ofuncs },
-       { 0x9039, &nvkm_object_ofuncs },
+       { FERMI_TWOD_A, &nvkm_object_ofuncs },
+       { FERMI_MEMORY_TO_MEMORY_FORMAT_A, &nvkm_object_ofuncs },
        { FERMI_A, &gf100_fermi_ofuncs, gf100_gr_9097_omthds },
        { FERMI_COMPUTE_A, &nvkm_object_ofuncs, gf100_gr_90c0_omthds },
        {}

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c
index 5362c8176e64b886b4c4669270ef79b68c953091..8df73421c78ca9f9e03557489edb1c80d0e3f998 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c
@@ -32,8 +32,8 @@
 
 static struct nvkm_oclass
 gf108_gr_sclass[] = {
-       { 0x902d, &nvkm_object_ofuncs },
-       { 0x9039, &nvkm_object_ofuncs },
+       { FERMI_TWOD_A, &nvkm_object_ofuncs },
+       { FERMI_MEMORY_TO_MEMORY_FORMAT_A, &nvkm_object_ofuncs },
        { FERMI_A, &gf100_fermi_ofuncs, gf100_gr_9097_omthds },
        { FERMI_B, &gf100_fermi_ofuncs, gf100_gr_9097_omthds },
        { FERMI_COMPUTE_A, &nvkm_object_ofuncs, gf100_gr_90c0_omthds },

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c
index 88beb491b7b8651f5287b923270b8f544a2fe36d..ef76e2dd1d31e600469e1f969b97dcff02c40439 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c
@@ -32,8 +32,8 @@
 
 struct nvkm_oclass
 gf110_gr_sclass[] = {
-       { 0x902d, &nvkm_object_ofuncs },
-       { 0x9039, &nvkm_object_ofuncs },
+       { FERMI_TWOD_A, &nvkm_object_ofuncs },
+       { FERMI_MEMORY_TO_MEMORY_FORMAT_A, &nvkm_object_ofuncs },
        { FERMI_A, &gf100_fermi_ofuncs, gf100_gr_9097_omthds },
        { FERMI_B, &gf100_fermi_ofuncs, gf100_gr_9097_omthds },
        { FERMI_C, &gf100_fermi_ofuncs, gf100_gr_9097_omthds },

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
index 9d85238d024a03e937b19ac40a390ed923faa582..46f7844eca7045f3ed71a0af1f8eb6c992337efe 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
@@ -34,8 +34,8 @@
 
 static struct nvkm_oclass
 gk104_gr_sclass[] = {
-       { 0x902d, &nvkm_object_ofuncs },
-       { 0xa040, &nvkm_object_ofuncs },
+       { FERMI_TWOD_A, &nvkm_object_ofuncs },
+       { KEPLER_INLINE_TO_MEMORY_A, &nvkm_object_ofuncs },
        { KEPLER_A, &gf100_fermi_ofuncs, gf100_gr_9097_omthds },
        { KEPLER_COMPUTE_A, &nvkm_object_ofuncs, gf100_gr_90c0_omthds },
        {}

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
index 291b60a9262e2492b19b86c611495ce09b73b3ca..f4cd8e5546af477e0cea931f0e4e5661b86b9bd5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
@@ -34,8 +34,8 @@
 
 struct nvkm_oclass
 gk110_gr_sclass[] = {
-       { 0x902d, &nvkm_object_ofuncs },
-       { 0xa140, &nvkm_object_ofuncs },
+       { FERMI_TWOD_A, &nvkm_object_ofuncs },
+       { KEPLER_INLINE_TO_MEMORY_B, &nvkm_object_ofuncs },
        { KEPLER_B, &gf100_fermi_ofuncs, gf100_gr_9097_omthds },
        { KEPLER_COMPUTE_B, &nvkm_object_ofuncs, gf100_gr_90c0_omthds },
        {}

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c
index 22d67fd8c323b04eadbd775ec2ffa56897940045..85f44a3d5d11604a0e554865af9fb13f6ea2cf64 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c
@@ -34,10 +34,10 @@
 
 static struct nvkm_oclass
 gk208_gr_sclass[] = {
-       { 0x902d, &nvkm_object_ofuncs },
-       { 0xa140, &nvkm_object_ofuncs },
+       { FERMI_TWOD_A, &nvkm_object_ofuncs },
+       { KEPLER_INLINE_TO_MEMORY_B, &nvkm_object_ofuncs },
        { KEPLER_B, &gf100_fermi_ofuncs },
-       { 0xa1c0, &nvkm_object_ofuncs },
+       { KEPLER_COMPUTE_B, &nvkm_object_ofuncs },
        {}
 };
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c
index 2137555340840572caed8615633b773d3b550e65..40ff5eb9180c097d1dab6907ac77e4f97dfab996 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c
@@ -26,8 +26,8 @@
 
 static struct nvkm_oclass
 gk20a_gr_sclass[] = {
-       { 0x902d, &nvkm_object_ofuncs },
-       { 0xa040, &nvkm_object_ofuncs },
+       { FERMI_TWOD_A, &nvkm_object_ofuncs },
+       { KEPLER_INLINE_TO_MEMORY_A, &nvkm_object_ofuncs },
        { KEPLER_C, &gf100_fermi_ofuncs, gf100_gr_9097_omthds },
        { KEPLER_COMPUTE_A, &nvkm_object_ofuncs, gf100_gr_90c0_omthds },
        {}

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c
index 0867eb06330278525c65df907f52f071cc9b2ec3..1da1d6354bb5df8a1740205090d2455c4d3d7445 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c
@@ -35,8 +35,8 @@
 
 static struct nvkm_oclass
 gm107_gr_sclass[] = {
-       { 0x902d, &nvkm_object_ofuncs },
-       { 0xa140, &nvkm_object_ofuncs },
+       { FERMI_TWOD_A, &nvkm_object_ofuncs },
+       { KEPLER_INLINE_TO_MEMORY_B, &nvkm_object_ofuncs },
        { MAXWELL_A, &gf100_fermi_ofuncs, gf100_gr_9097_omthds },
        { MAXWELL_COMPUTE_A, &nvkm_object_ofuncs, gf100_gr_90c0_omthds },
        {}