2 files changed, 36 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index dc27cdae..ee361953 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -187,6 +187,24 @@ static int gp106_get_litter_value(struct gk20a *g, int value)
         return ret;
 }
 
+int gp106_init_gpu_characteristics(struct gk20a *g)
+{
+        struct nvgpu_gpu_characteristics *gpu = &g->gpu_characteristics;
+
+        int err;
+
+        err = gk20a_init_gpu_characteristics(g);
+        if (err)
+                return err;
+
+        gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_GET_VOLTAGE |
+                        NVGPU_GPU_FLAGS_SUPPORT_GET_CURRENT |
+                        NVGPU_GPU_FLAGS_SUPPORT_GET_POWER |
+                        NVGPU_GPU_FLAGS_SUPPORT_GET_TEMPERATURE;
+
+        return 0;
+}
+
 int gp106_init_hal(struct gk20a *g)
 {
         struct gpu_ops *gops = &g->ops;
@@ -224,7 +242,7 @@ int gp106_init_hal(struct gk20a *g)
 
         gops->name = "gp10x";
         gops->get_litter_value = gp106_get_litter_value;
-        gops->chip_init_gpu_characteristics = gk20a_init_gpu_characteristics;
+        gops->chip_init_gpu_characteristics = gp106_init_gpu_characteristics;
         gops->gr_ctx.use_dma_for_fw_bootstrap = true;
         gops->read_ptimer = gk20a_read_ptimer;
 
diff --git a/drivers/gpu/nvgpu/gp106/therm_gp106.c b/drivers/gpu/nvgpu/gp106/therm_gp106.c
index a3aa3636..15aff89c 100644
--- a/drivers/gpu/nvgpu/gp106/therm_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/therm_gp106.c
@@ -15,10 +15,8 @@
 #include <linux/debugfs.h>
 #include "hw_therm_gp106.h"
 
-#ifdef CONFIG_DEBUG_FS
-static int therm_get_internal_sensor_curr_temp(void *data, u64 *val)
+static int gp106_get_internal_sensor_curr_temp(struct gk20a *g, u32 *temp_f24_8)
 {
-        struct gk20a *g = (struct gk20a *)data;
         int err = 0;
         u32 readval;
 
@@ -38,7 +36,21 @@ static int therm_get_internal_sensor_curr_temp(void *data, u64 *val)
         // Convert from F9.5 -> F27.5 -> F24.8.
         readval &= therm_temp_sensor_tsense_fixed_point_m();
 
-        *val = readval;
+        *temp_f24_8 = readval;
+
+        return err;
+}
+
+#ifdef CONFIG_DEBUG_FS
+static int therm_get_internal_sensor_curr_temp(void *data, u64 *val)
+{
+        struct gk20a *g = (struct gk20a *)data;
+        u32 readval;
+        int err;
+
+        err = gp106_get_internal_sensor_curr_temp(g, &readval);
+        if (!err)
+                *val = readval;
 
         return err;
 }
@@ -104,4 +116,5 @@ void gp106_init_therm_ops(struct gpu_ops *gops) {
         gops->therm.therm_debugfs_init = gp106_therm_debugfs_init;
 #endif
         gops->therm.elcg_init_idle_filters = gp106_elcg_init_idle_filters;
+        gops->therm.get_internal_sensor_curr_temp = gp106_get_internal_sensor_curr_temp;
 }