diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-04-14 16:21:25 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-24 03:13:44 -0400 |
commit | 3bd9d5764c9ab622302be912f549c7a0a7fcf643 (patch) | |
tree | 0a42f5db036cd199e57ca0b5b8c74e697574c4d2 /drivers/gpu/nvgpu/gk20a | |
parent | 13bebeced17c206995bd17c573d094968cc0fbca (diff) |
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>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/bus_gk20a.c | 7 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 2 |
2 files changed, 4 insertions, 5 deletions
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 |