8 files changed, 166 insertions, 16 deletions

diff --git a/drivers/devfreq/governor_wmark_active.c b/drivers/devfreq/governor_wmark_active.c
index 4f6d41c7a..8e98c809d 100644
--- a/drivers/devfreq/governor_wmark_active.c
+++ b/drivers/devfreq/governor_wmark_active.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2019, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -46,6 +46,9 @@ struct wmark_gov_info {
 
         /* variable for keeping the average frequency request */
         unsigned long long      average_target_freq;
+
+        /* devfreq notifier_block */
+        struct notifier_block nb;
 };
 
 static unsigned long freqlist_up(struct wmark_gov_info *wmarkinfo,
@@ -185,9 +188,6 @@ static int devfreq_watermark_target_freq(struct devfreq *df,
                 (wmarkinfo->p_smooth * wmarkinfo->average_target_freq +
                  ideal_freq) / (wmarkinfo->p_smooth + 1);
 
-        /* update watermarks to match the ideal frequency */
-        update_watermarks(df, dev_stat.current_frequency, ideal_freq);
-
         /* do not scale too often */
         if (dt < wmarkinfo->p_block_window)
                 return 0;
@@ -276,11 +276,38 @@ static int devfreq_watermark_start(struct devfreq *df)
         return 0;
 }
 
+static int devfreq_watermark_notifier_call(struct notifier_block *nb,
+                        unsigned long event, void *ptr)
+{
+        struct wmark_gov_info *data
+                                = container_of(nb, struct wmark_gov_info, nb);
+        struct devfreq *df = (struct devfreq *)data->df;
+        unsigned long freq = 0;
+
+        switch (event) {
+        case DEVFREQ_PRECHANGE:
+                break;
+        case DEVFREQ_POSTCHANGE:
+                /* get device freq. */
+                df->profile->get_cur_freq(df->dev.parent, &freq);
+
+                /* update watermarks by current device freq. */
+                if (freq)
+                        update_watermarks(df, freq, freq);
+                break;
+        default:
+                break;
+        }
+
+        return NOTIFY_DONE;
+}
+
 static int devfreq_watermark_event_handler(struct devfreq *df,
                         unsigned int event, void *wmark_type)
 {
         struct wmark_gov_info *wmarkinfo;
         int ret = 0;
+        struct notifier_block *nb;
 
         switch (event) {
         case DEVFREQ_GOV_START:
@@ -300,10 +327,20 @@ static int devfreq_watermark_event_handler(struct devfreq *df,
 
                 update_watermarks(df, dev_stat.current_frequency,
                                         dev_stat.current_frequency);
+
+                nb = &wmarkinfo->nb;
+                nb->notifier_call = devfreq_watermark_notifier_call;
+                ret = devm_devfreq_register_notifier(df->dev.parent,
+                                df, nb, DEVFREQ_TRANSITION_NOTIFIER);
                 break;
         }
         case DEVFREQ_GOV_STOP:
                 devfreq_watermark_debug_stop(df);
+
+                wmarkinfo = df->data;
+                nb = &wmarkinfo->nb;
+                devm_devfreq_unregister_notifier(df->dev.parent,
+                                df, nb, DEVFREQ_TRANSITION_NOTIFIER);
                 break;
         case DEVFREQ_GOV_SUSPEND:
                 devfreq_monitor_suspend(df);
diff --git a/drivers/video/tegra/host/host1x/host1x_actmon_t186.c b/drivers/video/tegra/host/host1x/host1x_actmon_t186.c
index 656e56469..8d2a3a52d 100644
--- a/drivers/video/tegra/host/host1x/host1x_actmon_t186.c
+++ b/drivers/video/tegra/host/host1x/host1x_actmon_t186.c
@@ -1,7 +1,7 @@
 /*
  * Tegra Graphics Host Actmon support for T186
  *
- * Copyright (c) 2015-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-2019, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -181,6 +181,21 @@ static void __iomem *host1x_actmon_get_regs(struct host1x_actmon *actmon)
         return NULL;
 }
 
+static unsigned long get_module_freq(struct host1x_actmon *actmon)
+{
+        unsigned long freq = 0;
+
+        struct platform_device *pdev = actmon->pdev;
+        struct nvhost_device_data *engine_pdata = platform_get_drvdata(pdev);
+        struct devfreq *df = engine_pdata->power_manager;
+        struct nvhost_device_data *pdata = dev_get_drvdata(df->dev.parent);
+        struct nvhost_device_profile *profile = pdata->power_profile;
+
+        freq = clk_get_rate(profile->clk);
+
+        return freq;
+}
+
 static int host1x_actmon_init(struct host1x_actmon *actmon)
 {
         struct platform_device *host_pdev = actmon->host->dev;
@@ -226,6 +241,10 @@ static int host1x_actmon_init(struct host1x_actmon *actmon)
         val |= actmon_local_ctrl_enb_cumulative_f(1);
         actmon_writel(actmon, val, actmon_local_ctrl_r());
 
+        /* Set COUNT_WEIGHT @actmon */
+        actmon_writel(actmon, engine_pdata->actmon_weight_count,
+                                        actmon_local_count_weight_r());
+
         /* Enable global interrupt */
         if (engine_pdata->actmon_irq)
                 actmon_writel(actmon, 0x1, actmon_glb_intr_en_r());
@@ -297,6 +316,8 @@ static int host1x_actmon_avg_norm(struct host1x_actmon *actmon, u32 *avg)
 {
         long val;
         int err;
+        unsigned long freq = 0;
+        u32 dev_cycle_per_sample = 0;
 
         if (!(actmon->init == ACTMON_READY && actmon->clks_per_sample > 0 &&
             actmon->divider)) {
@@ -313,7 +334,11 @@ static int host1x_actmon_avg_norm(struct host1x_actmon *actmon, u32 *avg)
         val = actmon_readl(actmon, actmon_local_avg_count_r());
         nvhost_module_idle(actmon->host->dev);
 
-        *avg = (val * 1000) / (actmon->clks_per_sample * actmon->divider);
+        freq = get_module_freq(actmon);
+        dev_cycle_per_sample = ((freq / 1000) * actmon->usecs_per_sample)
+                                                                / 1000;
+
+        *avg = (val * 1000) / dev_cycle_per_sample;
 
         return 0;
 }
@@ -366,13 +391,20 @@ static int host1x_actmon_count_norm(struct host1x_actmon *actmon, u32 *avg)