diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/driver_common.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/bus_gk20a.c | 7 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 2 |
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) | |||
104 | nvgpu_platform_is_silicon(g) ? platform->enable_mscg : false; | 104 | nvgpu_platform_is_silicon(g) ? platform->enable_mscg : false; |
105 | g->can_elpg = | 105 | g->can_elpg = |
106 | nvgpu_platform_is_silicon(g) ? platform->can_elpg : false; | 106 | nvgpu_platform_is_silicon(g) ? platform->can_elpg : false; |
107 | g->default_pri_timeout = platform->default_pri_timeout; | ||
107 | 108 | ||
108 | /* set default values to aelpg parameters */ | 109 | /* set default values to aelpg parameters */ |
109 | g->pmu.aelpg_param[0] = APCTRL_SAMPLING_PERIOD_PG_DEFAULT_US; | 110 | 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 @@ | |||
27 | 27 | ||
28 | void gk20a_bus_init_hw(struct gk20a *g) | 28 | void gk20a_bus_init_hw(struct gk20a *g) |
29 | { | 29 | { |
30 | struct gk20a_platform *platform = gk20a_get_platform(g->dev); | ||
31 | |||
32 | /* enable pri timeout only on silicon */ | 30 | /* enable pri timeout only on silicon */ |
33 | if (nvgpu_platform_is_silicon(g)) { | 31 | if (nvgpu_platform_is_silicon(g)) { |
34 | gk20a_writel(g, | 32 | gk20a_writel(g, |
35 | timer_pri_timeout_r(), | 33 | timer_pri_timeout_r(), |
36 | timer_pri_timeout_period_f( | 34 | timer_pri_timeout_period_f( |
37 | platform->default_pri_timeout ? | 35 | g->default_pri_timeout ? |
38 | platform->default_pri_timeout : | 36 | g->default_pri_timeout : 0x186A0) | |
39 | 0x186A0) | | ||
40 | timer_pri_timeout_en_en_enabled_f()); | 37 | timer_pri_timeout_en_en_enabled_f()); |
41 | } else { | 38 | } else { |
42 | gk20a_writel(g, | 39 | 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 { | |||
987 | bool forced_reset; | 987 | bool forced_reset; |
988 | bool allow_all; | 988 | bool allow_all; |
989 | 989 | ||
990 | u32 default_pri_timeout; | ||
991 | |||
990 | u32 emc3d_ratio; | 992 | u32 emc3d_ratio; |
991 | 993 | ||
992 | #ifdef CONFIG_DEBUG_FS | 994 | #ifdef CONFIG_DEBUG_FS |