9 files changed, 24 insertions, 17 deletions

diff --git a/drivers/gpu/drm/nouveau/include/nvif/class.h b/drivers/gpu/drm/nouveau/include/nvif/class.h
index 5ad17fc36ae3..67f1d9bd3403 100644
--- 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 86c9515018d0..3f05414c077c 100644
--- 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 5362c8176e64..8df73421c78c 100644
--- 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 88beb491b7b8..ef76e2dd1d31 100644
--- 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 9d85238d024a..46f7844eca70 100644
--- 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 291b60a9262e..f4cd8e5546af 100644
--- 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 22d67fd8c323..85f44a3d5d11 100644
--- 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 213755534084..40ff5eb9180c 100644
--- 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 0867eb063302..1da1d6354bb5 100644
--- 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 },
         {}