gpu: nvgpu: Return GPU classes in get_litter_value

Return GPU classes in HAL get_litter_value() instead of assigning
them to GPU characteristics at HAL initialization time.

JIRA NVGPU-259

Change-Id: Ife7a5cb38df3d33ce98a1caa43d3873fb1431234
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1593683
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 18 insertions, 8 deletions

diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index 5771e6e4..931780d5 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -179,6 +179,24 @@ static int gp106_get_litter_value(struct gk20a *g, int value)
         case GPU_LIT_FBPA_STRIDE:
                 ret = proj_fbpa_stride_v();
                 break;
+        case GPU_LIT_TWOD_CLASS:
+                ret = FERMI_TWOD_A;
+                break;
+        case GPU_LIT_THREED_CLASS:
+                ret = PASCAL_B;
+                break;
+        case GPU_LIT_COMPUTE_CLASS:
+                ret = PASCAL_COMPUTE_B;
+                break;
+        case GPU_LIT_GPFIFO_CLASS:
+                ret = PASCAL_CHANNEL_GPFIFO_A;
+                break;
+        case GPU_LIT_I2M_CLASS:
+                ret = KEPLER_INLINE_TO_MEMORY_B;
+                break;
+        case GPU_LIT_DMA_COPY_CLASS:
+                ret = PASCAL_DMA_COPY_A;
+                break;
         default:
                 BUG();
                 break;
@@ -694,7 +712,6 @@ static const struct gpu_ops gp106_ops = {
 int gp106_init_hal(struct gk20a *g)
 {
         struct gpu_ops *gops = &g->ops;
-        struct nvgpu_gpu_characteristics *c = &g->gpu_characteristics;
 
         gk20a_dbg_fn("");
 
@@ -757,13 +774,6 @@ int gp106_init_hal(struct gk20a *g)
 
         g->name = "gp10x";
 
-        c->twod_class = FERMI_TWOD_A;
-        c->threed_class = PASCAL_B;
-        c->compute_class = PASCAL_COMPUTE_B;
-        c->gpfifo_class = PASCAL_CHANNEL_GPFIFO_A;
-        c->inline_to_memory_class = KEPLER_INLINE_TO_MEMORY_B;
-        c->dma_copy_class = PASCAL_DMA_COPY_A;
-
         gk20a_dbg_fn("done");
 
         return 0;