From d7a8ef3285cf39c1fdc290ab2b1632176d6d3be2 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Sun, 15 Aug 2021 13:13:56 -0700 Subject: [PATCH] gpu: nvgpu: vgpu: set flag NVGPU_CLK_ARB_ENABLED NVGPU_CLK_ARB_ENABLED was not set correctly. The flag will only be set when the guest has clock control. Jira GVSCI-4658 Signed-off-by: Richard Zhao Change-Id: I3046be53e6d58cb2e8c6130cdbb89fad2d8e6d13 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2576941 Tested-by: mobile promotions Reviewed-by: Sagar Kamble Reviewed-by: svc_kernel_abi Reviewed-by: Alex Waterman Reviewed-by: Aparna Das Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_ga10b.c | 3 +++ drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_ga10b.c b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_ga10b.c index c9927815f..87fb31e24 100644 --- a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_ga10b.c +++ b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_ga10b.c @@ -1158,6 +1158,9 @@ int vgpu_ga10b_init_hal(struct gk20a *g) if (!priv->constants.can_set_clkrate) { gops->clk_arb.get_arbiter_clk_domains = NULL; + nvgpu_set_enabled(g, NVGPU_CLK_ARB_ENABLED, false); + } else { + nvgpu_set_enabled(g, NVGPU_CLK_ARB_ENABLED, true); } if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)){ diff --git a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c index dae2501c3..18900048e 100644 --- a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c @@ -1135,6 +1135,8 @@ int vgpu_gv11b_init_hal(struct gk20a *g) if (!priv->constants.can_set_clkrate) { gops->clk_arb.get_arbiter_clk_domains = NULL; nvgpu_set_enabled(g, NVGPU_CLK_ARB_ENABLED, false); + } else { + nvgpu_set_enabled(g, NVGPU_CLK_ARB_ENABLED, true); } #ifdef CONFIG_NVGPU_SM_DIVERSITY @@ -1179,7 +1181,6 @@ int vgpu_gv11b_init_hal(struct gk20a *g) #ifdef CONFIG_NVGPU_RECOVERY nvgpu_set_enabled(g, NVGPU_SUPPORT_FAULT_RECOVERY, true); #endif - nvgpu_set_enabled(g, NVGPU_CLK_ARB_ENABLED, true); g->name = "gv11b";