gpu: nvgpu: Move default_pri_timeout to gk20a

Copy default_pri_timeout to struct gk20a at probe time, and access it
from gk20a instead of platform_gk20a.

JIRA NVGPU-16

Change-Id: Ic361e6be59df73d9b627c97fdcff190b00dfe179
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1463541
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

3 files changed, 5 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c
index 67584f95..10394b22 100644
--- a/drivers/gpu/nvgpu/common/linux/driver_common.c
+++ b/drivers/gpu/nvgpu/common/linux/driver_common.c
@@ -104,6 +104,7 @@ 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 : false;
+        g->default_pri_timeout = platform->default_pri_timeout;
 
         /* set default values to aelpg parameters */
         g->pmu.aelpg_param[0] = APCTRL_SAMPLING_PERIOD_PG_DEFAULT_US;
diff --git a/drivers/gpu/nvgpu/gk20a/bus_gk20a.c b/drivers/gpu/nvgpu/gk20a/bus_gk20a.c
index e81a5b2a..5f25271f 100644
--- a/drivers/gpu/nvgpu/gk20a/bus_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/bus_gk20a.c
@@ -27,16 +27,13 @@
 
 void gk20a_bus_init_hw(struct gk20a *g)
 {
-        struct gk20a_platform *platform = gk20a_get_platform(g->dev);
-
         /* enable pri timeout only on silicon */
         if (nvgpu_platform_is_silicon(g)) {
                 gk20a_writel(g,
                         timer_pri_timeout_r(),
                         timer_pri_timeout_period_f(
-                                platform->default_pri_timeout ?
-                                        platform->default_pri_timeout :
-                                                                0x186A0) |
+                                g->default_pri_timeout ?
+                                        g->default_pri_timeout : 0x186A0) |
                         timer_pri_timeout_en_en_enabled_f());
         } else {
                 gk20a_writel(g,
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 2f25e406..a1700ebf 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -987,6 +987,8 @@ struct gk20a {
         bool forced_reset;
         bool allow_all;
 
+        u32 default_pri_timeout;
+
         u32 emc3d_ratio;
 
 #ifdef CONFIG_DEBUG_FS