summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2017-11-10 13:58:45 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2017-11-13 13:57:25 -0500
commitc0a461dbbccf56681ff531e7e4c8f5fb01c3e2cf (patch)
tree907077150f6fdf6a74c7db6d8575c24f1570adbe
parent8e611fb654e3f13258cd481cfd33d35d8d0fb8bb (diff)
gpu: nvgpu: Do not assign GPU classes in vgpu HAL
GPU class ids were moved to get_litter_value API, but vgpu was not updated to remove assigning them in HAL initialization. Remove the duplicate assignments. JIRA NVGPU-388 Change-Id: I65cf8f9cfcfc372c1c3b0d9239e55f19c9a02f46 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1596247 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r--drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c8
-rw-r--r--drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c8
2 files changed, 0 insertions, 16 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c b/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c
index 3fc8b73b..37a34950 100644
--- a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c
+++ b/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c
@@ -470,7 +470,6 @@ static const struct gpu_ops vgpu_gm20b_ops = {
470int vgpu_gm20b_init_hal(struct gk20a *g) 470int vgpu_gm20b_init_hal(struct gk20a *g)
471{ 471{
472 struct gpu_ops *gops = &g->ops; 472 struct gpu_ops *gops = &g->ops;
473 struct nvgpu_gpu_characteristics *c = &g->gpu_characteristics;
474 u32 val; 473 u32 val;
475 474
476 gops->ltc = vgpu_gm20b_ops.ltc; 475 gops->ltc = vgpu_gm20b_ops.ltc;
@@ -586,12 +585,5 @@ int vgpu_gm20b_init_hal(struct gk20a *g)
586 585
587 g->name = "gm20b"; 586 g->name = "gm20b";
588 587
589 c->twod_class = FERMI_TWOD_A;
590 c->threed_class = MAXWELL_B;
591 c->compute_class = MAXWELL_COMPUTE_B;
592 c->gpfifo_class = MAXWELL_CHANNEL_GPFIFO_A;
593 c->inline_to_memory_class = KEPLER_INLINE_TO_MEMORY_B;
594 c->dma_copy_class = MAXWELL_DMA_COPY_A;
595
596 return 0; 588 return 0;
597} 589}
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
index e4e5a885..693709ef 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
@@ -511,7 +511,6 @@ static const struct gpu_ops vgpu_gp10b_ops = {
511int vgpu_gp10b_init_hal(struct gk20a *g) 511int vgpu_gp10b_init_hal(struct gk20a *g)
512{ 512{
513 struct gpu_ops *gops = &g->ops; 513 struct gpu_ops *gops = &g->ops;
514 struct nvgpu_gpu_characteristics *c = &g->gpu_characteristics;
515 u32 val; 514 u32 val;
516 515
517 gops->ltc = vgpu_gp10b_ops.ltc; 516 gops->ltc = vgpu_gp10b_ops.ltc;
@@ -628,12 +627,5 @@ int vgpu_gp10b_init_hal(struct gk20a *g)
628 627
629 g->name = "gp10b"; 628 g->name = "gp10b";
630 629
631 c->twod_class = FERMI_TWOD_A;
632 c->threed_class = PASCAL_A;
633 c->compute_class = PASCAL_COMPUTE_A;
634 c->gpfifo_class = PASCAL_CHANNEL_GPFIFO_A;
635 c->inline_to_memory_class = KEPLER_INLINE_TO_MEMORY_B;
636 c->dma_copy_class = PASCAL_DMA_COPY_A;
637
638 return 0; 630 return 0;
639} 631}