4 files changed, 32 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c
index e8530c05..5f2961f4 100644
--- a/drivers/gpu/nvgpu/common/linux/driver_common.c
+++ b/drivers/gpu/nvgpu/common/linux/driver_common.c
@@ -116,6 +116,14 @@ static void nvgpu_init_pm_vars(struct gk20a *g)
                 nvgpu_platform_is_silicon(g) ? platform->enable_mscg : false;
         g->can_elpg =
                 nvgpu_platform_is_silicon(g) ? platform->can_elpg_init : false;
+
+        __nvgpu_set_enabled(g, NVGPU_GPU_CAN_ELCG,
+                nvgpu_platform_is_silicon(g) ? platform->can_elcg : false);
+        __nvgpu_set_enabled(g, NVGPU_GPU_CAN_SLCG,
+                nvgpu_platform_is_silicon(g) ? platform->can_slcg : false);
+        __nvgpu_set_enabled(g, NVGPU_GPU_CAN_BLCG,
+                nvgpu_platform_is_silicon(g) ? platform->can_blcg : false);
+
         g->default_pri_timeout = platform->default_pri_timeout;
         g->aggressive_sync_destroy = platform->aggressive_sync_destroy;
         g->aggressive_sync_destroy_thresh = platform->aggressive_sync_destroy_thresh;
diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/common/linux/pci.c
index 1a7d1842..6e3e02e5 100644
--- a/drivers/gpu/nvgpu/common/linux/pci.c
+++ b/drivers/gpu/nvgpu/common/linux/pci.c
@@ -79,6 +79,9 @@ static struct gk20a_platform nvgpu_pci_device[] = {
         .enable_slcg = true,
         .enable_blcg = true,
         .enable_mscg = true,
+        .can_slcg    = true,
+        .can_blcg    = true,
+        .can_elcg    = true,
         .default_pri_timeout = 0x3ff,
 
         .disable_aspm = true,
@@ -112,6 +115,9 @@ static struct gk20a_platform nvgpu_pci_device[] = {
         .enable_slcg = true,
         .enable_blcg = true,
         .enable_mscg = true,
+        .can_slcg    = true,
+        .can_blcg    = true,
+        .can_elcg    = true,
         .default_pri_timeout = 0x3ff,
 
         .disable_aspm = true,
@@ -145,6 +151,9 @@ static struct gk20a_platform nvgpu_pci_device[] = {
         .enable_slcg = true,
         .enable_blcg = true,
         .enable_mscg = true,
+        .can_slcg    = true,
+        .can_blcg    = true,
+        .can_elcg    = true,
         .default_pri_timeout = 0x3ff,
 
         .disable_aspm = true,
@@ -178,6 +187,9 @@ static struct gk20a_platform nvgpu_pci_device[] = {
         .enable_slcg = true,
         .enable_blcg = true,
         .enable_mscg = true,
+        .can_slcg    = true,
+        .can_blcg    = true,
+        .can_elcg    = true,
         .default_pri_timeout = 0x3ff,
 
         .disable_aspm = true,
@@ -211,6 +223,9 @@ static struct gk20a_platform nvgpu_pci_device[] = {
         .enable_slcg = false,
         .enable_blcg = false,
         .enable_mscg = false,
+        .can_slcg    = false,
+        .can_blcg    = false,
+        .can_elcg    = false,
         .default_pri_timeout = 0x3ff,
 
         .disable_aspm = true,
@@ -241,6 +256,9 @@ static struct gk20a_platform nvgpu_pci_device[] = {
         .enable_slcg = false,
         .enable_blcg = false,
         .enable_mscg = false,
+        .can_slcg    = false,
+        .can_blcg    = false,
+        .can_elcg    = false,
         .default_pri_timeout = 0x3ff,
 
         .disable_aspm = true,
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
index 2c556d8a..6379d8ef 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
@@ -911,6 +911,9 @@ struct gk20a_platform gm20b_tegra_platform = {
         .enable_slcg            = true,
         .enable_blcg            = true,
         .enable_elcg            = true,
+        .can_slcg               = true,
+        .can_blcg               = true,
+        .can_elcg               = true,
         .enable_elpg            = true,
         .enable_aelpg           = true,
         .enable_perfmon         = true,
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c
index bdb7fb3f..c1ff34e3 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c
+++ b/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c
@@ -373,6 +373,9 @@ struct gk20a_platform gp10b_tegra_platform = {
         .enable_blcg            = true,
         .enable_slcg            = true,
         .enable_elcg            = true,
+        .can_slcg               = true,
+        .can_blcg               = true,
+        .can_elcg               = true,
         .enable_aelpg       = true,
         .enable_perfmon         = true,