From 3e11a4fbb23732955ea06aa025803d818c8352da Mon Sep 17 00:00:00 2001 From: Haley Teng Date: Mon, 6 Oct 2014 11:45:12 +0800 Subject: 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 Reviewed-on: http://git-master/r/553653 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/pmu_gk20a.c') 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) if (err) return err; - if (support_gk20a_pmu()) { + if (support_gk20a_pmu(g->dev)) { err = gk20a_init_pmu_setup_sw(g); if (err) return err; @@ -3665,7 +3665,7 @@ int gk20a_pmu_destroy(struct gk20a *g) gk20a_dbg_fn(""); - if (!support_gk20a_pmu()) + if (!support_gk20a_pmu(g->dev)) return 0; /* make sure the pending operations are finished before we continue */ -- cgit v1.2.2