4 files changed, 8 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/debug_pmu.c b/drivers/gpu/nvgpu/common/linux/debug_pmu.c
index 0d364fe7..8c3607b5 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_pmu.c
+++ b/drivers/gpu/nvgpu/common/linux/debug_pmu.c
@@ -12,6 +12,7 @@
  *
  */
 
+#include <nvgpu/enabled.h>
 #include "debug_pmu.h"
 #include "gk20a/platform_gk20a.h"
 
@@ -348,10 +349,12 @@ static ssize_t perfmon_events_enable_write(struct file *file,
                 if (err)
                         return err;
 
-                if (val && !g->pmu.perfmon_sampling_enabled) {
+                if (val && !g->pmu.perfmon_sampling_enabled &&
+                                nvgpu_is_enabled(g, NVGPU_PMU_PERFMON)) {
                         g->pmu.perfmon_sampling_enabled = true;
                         nvgpu_pmu_perfmon_start_sampling(&(g->pmu));
-                } else if (!val && g->pmu.perfmon_sampling_enabled) {
+                } else if (!val && g->pmu.perfmon_sampling_enabled &&
+                                nvgpu_is_enabled(g, NVGPU_PMU_PERFMON)) {
                         g->pmu.perfmon_sampling_enabled = false;
                         nvgpu_pmu_perfmon_stop_sampling(&(g->pmu));
                 }
diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c
index b12917d6..4e2cb2b4 100644
--- a/drivers/gpu/nvgpu/common/linux/driver_common.c
+++ b/drivers/gpu/nvgpu/common/linux/driver_common.c
@@ -124,6 +124,7 @@ static void nvgpu_init_pm_vars(struct gk20a *g)
         g->support_pmu = support_gk20a_pmu(dev_from_gk20a(g));
         g->can_railgate = platform->can_railgate_init;
         g->railgate_delay = platform->railgate_delay_init;
+        __nvgpu_set_enabled(g, NVGPU_PMU_PERFMON, platform->enable_perfmon);
 
         /* set default values to aelpg parameters */
         g->pmu.aelpg_param[0] = APCTRL_SAMPLING_PERIOD_PG_DEFAULT_US;
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
index 2c1709ea..000e9eee 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
@@ -920,6 +920,7 @@ struct gk20a_platform gm20b_tegra_platform = {
         .enable_elcg            = true,
         .enable_elpg            = true,
         .enable_aelpg           = true,
+        .enable_perfmon         = true,
         .ptimer_src_freq        = 19200000,
 
         .force_reset_in_do_idle = false,
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c
index 61b8053f..83d3634c 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c
+++ b/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c
@@ -377,6 +377,7 @@ struct gk20a_platform gp10b_tegra_platform = {
         .enable_slcg            = true,
         .enable_elcg            = true,
         .enable_aelpg       = true,
+        .enable_perfmon         = true,
 
         /* ptimer src frequency in hz*/
         .ptimer_src_freq        = 31250000,