5 files changed, 32 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/clk/clk_arb.h b/drivers/gpu/nvgpu/clk/clk_arb.h
index 717cca9b..8355dac5 100644
--- a/drivers/gpu/nvgpu/clk/clk_arb.h
+++ b/drivers/gpu/nvgpu/clk/clk_arb.h
@@ -61,6 +61,6 @@ int nvgpu_clk_arb_install_event_fd(struct gk20a *g,
 int nvgpu_clk_arb_install_request_fd(struct gk20a *g,
         struct nvgpu_clk_session *session, int *event_fd);
 
-void nvgpu_clk_arb_schedule_vftable_update(struct gk20a *g);
+void nvgpu_clk_arb_schedule_vf_table_update(struct gk20a *g);
 #endif /* _CLK_ARB_H_ */
 
diff --git a/drivers/gpu/nvgpu/gp106/therm_gp106.c b/drivers/gpu/nvgpu/gp106/therm_gp106.c
index 15aff89c..7bdf0b9e 100644
--- a/drivers/gpu/nvgpu/gp106/therm_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/therm_gp106.c
@@ -15,6 +15,12 @@
 #include <linux/debugfs.h>
 #include "hw_therm_gp106.h"
 
+static void gp106_get_internal_sensor_limits(s32 *max_24_8, s32 *min_24_8)
+{
+        *max_24_8 = (0x87 << 8);
+        *min_24_8 = ((-216) << 8);
+}
+
 static int gp106_get_internal_sensor_curr_temp(struct gk20a *g, u32 *temp_f24_8)
 {
         int err = 0;
@@ -117,4 +123,6 @@ void gp106_init_therm_ops(struct gpu_ops *gops) {
 #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;
+        gops->therm.get_internal_sensor_limits =
+                        gp106_get_internal_sensor_limits;
 }
diff --git a/drivers/gpu/nvgpu/perf/perf.c b/drivers/gpu/nvgpu/perf/perf.c
index 3821a8dc..41ebb315 100644
--- a/drivers/gpu/nvgpu/perf/perf.c
+++ b/drivers/gpu/nvgpu/perf/perf.c
@@ -16,6 +16,7 @@
 #include "pmuif/gpmuifperf.h"
 #include "pmuif/gpmuifperfvfe.h"
 #include "gk20a/pmu_gk20a.h"
+#include "clk/clk_arb.h"
 
 struct perfrpc_pmucmdhandler_params {
         struct nv_pmu_perf_rpc *prpccall;
@@ -41,6 +42,22 @@ static void perfrpc_pmucmdhandler(struct gk20a *g, struct pmu_msg *msg,
                 phandlerparams->success = 1;
 }
 
+static int pmu_handle_perf_event(struct gk20a *g, void *pmu_msg)
+{
+        struct nv_pmu_perf_msg *msg = (struct nv_pmu_perf_msg *)pmu_msg;
+
+        gk20a_dbg_fn("");
+        switch (msg->msg_type) {
+        case NV_PMU_PERF_MSG_ID_VFE_CALLBACK:
+                nvgpu_clk_arb_schedule_vf_table_update(g);
+                break;
+        default:
+                WARN_ON(1);
+                break;
+        }
+        return 0;
+}
+
 u32 perf_pmu_vfe_load(struct gk20a *g)
 {
         struct pmu_cmd cmd;
@@ -51,6 +68,9 @@ u32 perf_pmu_vfe_load(struct gk20a *g)
         struct nv_pmu_perf_rpc rpccall = {0};
         struct perfrpc_pmucmdhandler_params handler = {0};
 
+        /*register call back for future VFE updates*/
+        g->ops.perf.handle_pmu_perf_event = pmu_handle_perf_event;
+
         rpccall.function = NV_PMU_PERF_RPC_ID_VFE_LOAD;
         rpccall.params.vfe_load.b_load = true;
         cmd.hdr.unit_id = PMU_UNIT_PERF;
diff --git a/drivers/gpu/nvgpu/perf/vfe_var.c b/drivers/gpu/nvgpu/perf/vfe_var.c
index 90963478..4f8dc83b 100644
--- a/drivers/gpu/nvgpu/perf/vfe_var.c
+++ b/drivers/gpu/nvgpu/perf/vfe_var.c
@@ -921,7 +921,7 @@ static u32 devinit_get_vfe_var_table(struct gk20a *g,
 
                 case VBIOS_VFE_3X_VAR_ENTRY_TYPE_SINGLE_SENSED_TEMP:
                         var_type = CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_TEMP;
-                        var_data.single_sensed_temp.temp_default = 105;
+                        var_data.single_sensed_temp.temp_default = 0x9600;
                         var_data.single_sensed_temp.therm_channel_index =
                                 (u8)BIOS_GET_FIELD(var.param0,
                                         VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSTEMP_TH_CH_IDX);
diff --git a/drivers/gpu/nvgpu/therm/thrmchannel.c b/drivers/gpu/nvgpu/therm/thrmchannel.c
index 015e065b..b5a7dfd2 100644
--- a/drivers/gpu/nvgpu/therm/thrmchannel.c
+++ b/drivers/gpu/nvgpu/therm/thrmchannel.c
@@ -74,9 +74,8 @@ static struct boardobj *construct_channel_device(struct gk20a *g,
         pchannel = (struct therm_channel *)board_obj_ptr;
         pchannel_device = (struct therm_channel_device *)board_obj_ptr;
 
-        pchannel->temp_min = 0;
-        pchannel->temp_max = 0;
-
+        g->ops.therm.get_internal_sensor_limits(&pchannel->temp_max,
+                &pchannel->temp_min);
         pchannel->scaling = (1 << 8);
         pchannel->offset = 0;