summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
diff options
context:
space:
mode:
authorHaley Teng <hteng@nvidia.com>2014-10-05 23:45:12 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:11:41 -0400
commit3e11a4fbb23732955ea06aa025803d818c8352da (patch)
treeef5cace89c9beac814134d4ed359ab254e2ae9f8 /drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
parentf56d50ddac2ea70c7d50f22b9cd74408b1042da3 (diff)
gpu: nvgpu: vgpu: disable GK20A PMU support
GK20A PMU is not supported in GPU client for virtualization. However, to make native case and virtualization case can share same defconfig and kernel image, we need to enable CONFIG_GK20A_PMU and CONFIG_GK20A_DEVFREQ in defconfig. This commit changes to detect if we should disable GK20A PMU support in run time. Bug 200041597 Change-Id: I292c647303ed57af6faa1c5671037ca27b48e31e Signed-off-by: Haley Teng <hteng@nvidia.com> Reviewed-on: http://git-master/r/553653 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/pmu_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/pmu_gk20a.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 7a62f05c..7878e1e2 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -2345,7 +2345,7 @@ int gk20a_init_pmu_support(struct gk20a *g)
2345 if (err) 2345 if (err)
2346 return err; 2346 return err;
2347 2347
2348 if (support_gk20a_pmu()) { 2348 if (support_gk20a_pmu(g->dev)) {
2349 err = gk20a_init_pmu_setup_sw(g); 2349 err = gk20a_init_pmu_setup_sw(g);
2350 if (err) 2350 if (err)
2351 return err; 2351 return err;
@@ -3665,7 +3665,7 @@ int gk20a_pmu_destroy(struct gk20a *g)
3665 3665
3666 gk20a_dbg_fn(""); 3666 gk20a_dbg_fn("");
3667 3667
3668 if (!support_gk20a_pmu()) 3668 if (!support_gk20a_pmu(g->dev))
3669 return 0; 3669 return 0;
3670 3670
3671 /* make sure the pending operations are finished before we continue */ 3671 /* make sure the pending operations are finished before we continue */