diff options
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/vgpu.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index 56a6b01a..9b3b4ed5 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | |||
@@ -548,6 +548,9 @@ static const struct gpu_ops vgpu_gp10b_ops = { | |||
548 | .read_vin_cal_slope_intercept_fuse = NULL, | 548 | .read_vin_cal_slope_intercept_fuse = NULL, |
549 | .read_vin_cal_gain_offset_fuse = NULL, | 549 | .read_vin_cal_gain_offset_fuse = NULL, |
550 | }, | 550 | }, |
551 | .acr = { | ||
552 | .acr_sw_init = nvgpu_gm20b_acr_sw_init, | ||
553 | }, | ||
551 | .chip_init_gpu_characteristics = vgpu_init_gpu_characteristics, | 554 | .chip_init_gpu_characteristics = vgpu_init_gpu_characteristics, |
552 | .get_litter_value = gp10b_get_litter_value, | 555 | .get_litter_value = gp10b_get_litter_value, |
553 | }; | 556 | }; |
@@ -585,6 +588,7 @@ int vgpu_gp10b_init_hal(struct gk20a *g) | |||
585 | gops->priv_ring = vgpu_gp10b_ops.priv_ring; | 588 | gops->priv_ring = vgpu_gp10b_ops.priv_ring; |
586 | 589 | ||
587 | gops->fuse = vgpu_gp10b_ops.fuse; | 590 | gops->fuse = vgpu_gp10b_ops.fuse; |
591 | gops->acr = vgpu_gp10b_ops.acr; | ||
588 | 592 | ||
589 | /* Lone Functions */ | 593 | /* Lone Functions */ |
590 | gops->chip_init_gpu_characteristics = | 594 | gops->chip_init_gpu_characteristics = |
@@ -631,7 +635,6 @@ int vgpu_gp10b_init_hal(struct gk20a *g) | |||
631 | 635 | ||
632 | __nvgpu_set_enabled(g, NVGPU_PMU_FECS_BOOTSTRAP_DONE, false); | 636 | __nvgpu_set_enabled(g, NVGPU_PMU_FECS_BOOTSTRAP_DONE, false); |
633 | g->pmu_lsf_pmu_wpr_init_done = 0; | 637 | g->pmu_lsf_pmu_wpr_init_done = 0; |
634 | g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT; | ||
635 | 638 | ||
636 | g->name = "gp10b"; | 639 | g->name = "gp10b"; |
637 | 640 | ||
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index bcd352e7..9ad0468e 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c | |||
@@ -217,6 +217,10 @@ void vgpu_remove_support_common(struct gk20a *g) | |||
217 | if (g->pmu.remove_support) | 217 | if (g->pmu.remove_support) |
218 | g->pmu.remove_support(&g->pmu); | 218 | g->pmu.remove_support(&g->pmu); |
219 | 219 | ||
220 | if (g->acr.remove_support != NULL) { | ||
221 | g->acr.remove_support(&g->acr); | ||
222 | } | ||
223 | |||
220 | if (g->gr.remove_support) | 224 | if (g->gr.remove_support) |
221 | g->gr.remove_support(&g->gr); | 225 | g->gr.remove_support(&g->gr); |
222 | 226 | ||