From f9490bd0657bfea31ec61fcc9c027258ea436495 Mon Sep 17 00:00:00 2001 From: Vinod G Date: Wed, 5 Dec 2018 13:37:04 -0800 Subject: [PATCH] gpu: nvgpu: dGpu VDK support Set acr sw_init to NULL, not supported in dGpu VDK. Set NVGPU_GR_USE_DMA_FOR_FW_BOOTSTRAP to false. JIRA NVGPU-1564 Change-Id: Ic1dbbefc1fb5cff0a74737b54271287a08bef5d8 Signed-off-by: Vinod G Reviewed-on: https://git-master.nvidia.com/r/1966356 Reviewed-by: svc-mobile-coverity Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Seshendra Gadagottu Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/tu104/hal_tu104.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/nvgpu/tu104/hal_tu104.c b/drivers/gpu/nvgpu/tu104/hal_tu104.c index ae0aad523..37ff73354 100644 --- a/drivers/gpu/nvgpu/tu104/hal_tu104.c +++ b/drivers/gpu/nvgpu/tu104/hal_tu104.c @@ -1070,7 +1070,6 @@ int tu104_init_hal(struct gk20a *g) gops->get_litter_value = tu104_ops.get_litter_value; gops->semaphore_wakeup = gk20a_channel_semaphore_wakeup; - __nvgpu_set_enabled(g, NVGPU_GR_USE_DMA_FOR_FW_BOOTSTRAP, true); __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, true); __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, true); __nvgpu_set_enabled(g, NVGPU_PMU_FECS_BOOTSTRAP_DONE, false); @@ -1094,10 +1093,17 @@ int tu104_init_hal(struct gk20a *g) gops->ltc.init_comptags = NULL; gops->fb.init_cbc = NULL; + /* Disable acr init */ + gops->acr.acr_sw_init = NULL; + /* Disable pmu pstate, as there is no pmu support */ __nvgpu_set_enabled(g, NVGPU_PMU_PSTATE, false); + + __nvgpu_set_enabled(g, NVGPU_GR_USE_DMA_FOR_FW_BOOTSTRAP, + false); } else { __nvgpu_set_enabled(g, NVGPU_PMU_PSTATE, true); + __nvgpu_set_enabled(g, NVGPU_GR_USE_DMA_FOR_FW_BOOTSTRAP, true); } g->pmu_lsf_pmu_wpr_init_done = 0;