gpu: nvgpu: Add class numbers to characteristics

Some kernel APIs rely on user space knowing class numbers. Allow
querying the numbers from kernel.

Bug 1567274

Change-Id: Idec2fe8ee983ee74bcbf9dfc98f71bbcc1492cfb
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/594402

3 files changed, 18 insertions, 6 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.h b/drivers/gpu/nvgpu/gm20b/gr_gm20b.h
index 8348b9d9..470e5bae 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.h
@@ -18,9 +18,11 @@
 struct gk20a;
 
 enum {
-        MAXWELL_B                 = 0xB197,
-        MAXWELL_COMPUTE_B         = 0xB1C0,
-        MAXWELL_DMA_COPY_A         = 0xB0B5,
+        MAXWELL_B               = 0xB197,
+        MAXWELL_COMPUTE_B       = 0xB1C0,
+        KEPLER_INLINE_TO_MEMORY_B= 0xA140,
+        MAXWELL_DMA_COPY_A      = 0xB0B5,
+        MAXWELL_CHANNEL_GPFIFO_A= 0xB06F,
 };
 
 #define NVB197_SET_ALPHA_CIRCULAR_BUFFER_SIZE   0x02dc
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index 2b534816..e95f8878 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -83,8 +83,11 @@ static struct gpu_ops gm20b_ops = {
         }
 };
 
-int gm20b_init_hal(struct gpu_ops *gops)
+int gm20b_init_hal(struct gk20a *g)
 {
+        struct gpu_ops *gops = &g->ops;
+        struct nvgpu_gpu_characteristics *c = &g->gpu_characteristics;
+
         *gops = gm20b_ops;
 #ifdef CONFIG_TEGRA_ACR
         if (tegra_platform_is_linsim()) {
@@ -127,5 +130,12 @@ int gm20b_init_hal(struct gpu_ops *gops)
         gm20b_init_regops(gops);
         gops->name = "gm20b";
 
+        c->twod_class = FERMI_TWOD_A;
+        c->threed_class = MAXWELL_B;
+        c->compute_class = MAXWELL_COMPUTE_B;
+        c->gpfifo_class = MAXWELL_CHANNEL_GPFIFO_A;
+        c->inline_to_memory_class = KEPLER_INLINE_TO_MEMORY_B;
+        c->dma_copy_class = MAXWELL_DMA_COPY_A;
+
         return 0;
 }
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.h b/drivers/gpu/nvgpu/gm20b/hal_gm20b.h
index 99e193fc..2416876d 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.h
@@ -15,7 +15,7 @@
 
 #ifndef _NVHOST_HAL_GM20B_H
 #define _NVHOST_HAL_GM20B_H
-struct gpu_ops;
+struct gk20a;
 
-int gm20b_init_hal(struct gpu_ops *gops);
+int gm20b_init_hal(struct gk20a *g);
 #endif