diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hal_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hw_therm_gk20a.h | 48 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/therm_gk20a.c | 25 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/therm_gk20a.h | 11 |
5 files changed, 75 insertions, 14 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 1cf90fbf..328bb73b 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -388,6 +388,9 @@ struct gpu_ops { | |||
388 | u32 flags); | 388 | u32 flags); |
389 | } mm; | 389 | } mm; |
390 | struct { | 390 | struct { |
391 | int (*init_therm_setup_hw)(struct gk20a *g); | ||
392 | } therm; | ||
393 | struct { | ||
391 | int (*prepare_ucode)(struct gk20a *g); | 394 | int (*prepare_ucode)(struct gk20a *g); |
392 | int (*pmu_setup_hw_and_bootstrap)(struct gk20a *g); | 395 | int (*pmu_setup_hw_and_bootstrap)(struct gk20a *g); |
393 | int (*pmu_nsbootstrap)(struct pmu_gk20a *pmu); | 396 | int (*pmu_nsbootstrap)(struct pmu_gk20a *pmu); |
diff --git a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c index b8268e1f..a9ad970a 100644 --- a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include "pmu_gk20a.h" | 27 | #include "pmu_gk20a.h" |
28 | #include "clk_gk20a.h" | 28 | #include "clk_gk20a.h" |
29 | #include "regops_gk20a.h" | 29 | #include "regops_gk20a.h" |
30 | #include "therm_gk20a.h" | ||
30 | 31 | ||
31 | static struct gpu_ops gk20a_ops = { | 32 | static struct gpu_ops gk20a_ops = { |
32 | .clock_gating = { | 33 | .clock_gating = { |
@@ -65,6 +66,7 @@ int gk20a_init_hal(struct gk20a *g) | |||
65 | gk20a_init_clk_ops(gops); | 66 | gk20a_init_clk_ops(gops); |
66 | gk20a_init_regops(gops); | 67 | gk20a_init_regops(gops); |
67 | gk20a_init_debug_ops(gops); | 68 | gk20a_init_debug_ops(gops); |
69 | gk20a_init_therm_ops(gops); | ||
68 | gops->name = "gk20a"; | 70 | gops->name = "gk20a"; |
69 | 71 | ||
70 | c->twod_class = FERMI_TWOD_A; | 72 | c->twod_class = FERMI_TWOD_A; |
diff --git a/drivers/gpu/nvgpu/gk20a/hw_therm_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_therm_gk20a.h index 67f1bbc2..d4c04116 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_therm_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/hw_therm_gk20a.h | |||
@@ -54,18 +54,66 @@ static inline u32 therm_use_a_r(void) | |||
54 | { | 54 | { |
55 | return 0x00020798; | 55 | return 0x00020798; |
56 | } | 56 | } |
57 | static inline u32 therm_use_a_ext_therm_0_enable_f(void) | ||
58 | { | ||
59 | return 0x1; | ||
60 | } | ||
61 | static inline u32 therm_use_a_ext_therm_1_enable_f(void) | ||
62 | { | ||
63 | return 0x2; | ||
64 | } | ||
65 | static inline u32 therm_use_a_ext_therm_2_enable_f(void) | ||
66 | { | ||
67 | return 0x4; | ||
68 | } | ||
57 | static inline u32 therm_evt_ext_therm_0_r(void) | 69 | static inline u32 therm_evt_ext_therm_0_r(void) |
58 | { | 70 | { |
59 | return 0x00020700; | 71 | return 0x00020700; |
60 | } | 72 | } |
73 | static inline u32 therm_evt_ext_therm_0_slow_factor_f(u32 v) | ||
74 | { | ||
75 | return (v & 0x3f) << 8; | ||
76 | } | ||
77 | static inline u32 therm_evt_ext_therm_0_slow_factor_init_v(void) | ||
78 | { | ||
79 | return 0x00000000; | ||
80 | } | ||
81 | static inline u32 therm_evt_ext_therm_0_priority_f(u32 v) | ||
82 | { | ||
83 | return (v & 0x1f) << 24; | ||
84 | } | ||
61 | static inline u32 therm_evt_ext_therm_1_r(void) | 85 | static inline u32 therm_evt_ext_therm_1_r(void) |
62 | { | 86 | { |
63 | return 0x00020704; | 87 | return 0x00020704; |
64 | } | 88 | } |
89 | static inline u32 therm_evt_ext_therm_1_slow_factor_f(u32 v) | ||
90 | { | ||
91 | return (v & 0x3f) << 8; | ||
92 | } | ||
93 | static inline u32 therm_evt_ext_therm_1_slow_factor_init_v(void) | ||
94 | { | ||
95 | return 0x00000000; | ||
96 | } | ||
97 | static inline u32 therm_evt_ext_therm_1_priority_f(u32 v) | ||
98 | { | ||
99 | return (v & 0x1f) << 24; | ||
100 | } | ||
65 | static inline u32 therm_evt_ext_therm_2_r(void) | 101 | static inline u32 therm_evt_ext_therm_2_r(void) |
66 | { | 102 | { |
67 | return 0x00020708; | 103 | return 0x00020708; |
68 | } | 104 | } |
105 | static inline u32 therm_evt_ext_therm_2_slow_factor_f(u32 v) | ||
106 | { | ||
107 | return (v & 0x3f) << 8; | ||
108 | } | ||
109 | static inline u32 therm_evt_ext_therm_2_slow_factor_init_v(void) | ||
110 | { | ||
111 | return 0x00000000; | ||
112 | } | ||
113 | static inline u32 therm_evt_ext_therm_2_priority_f(u32 v) | ||
114 | { | ||
115 | return (v & 0x1f) << 24; | ||
116 | } | ||
69 | static inline u32 therm_weight_1_r(void) | 117 | static inline u32 therm_weight_1_r(void) |
70 | { | 118 | { |
71 | return 0x00020024; | 119 | return 0x00020024; |
diff --git a/drivers/gpu/nvgpu/gk20a/therm_gk20a.c b/drivers/gpu/nvgpu/gk20a/therm_gk20a.c index fd4149ae..1c1b8419 100644 --- a/drivers/gpu/nvgpu/gk20a/therm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/therm_gk20a.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * GK20A Therm | 4 | * GK20A Therm |
5 | * | 5 | * |
6 | * Copyright (c) 2011-2014, NVIDIA CORPORATION. All rights reserved. | 6 | * Copyright (c) 2011-2015, NVIDIA CORPORATION. All rights reserved. |
7 | * | 7 | * |
8 | * This program is free software; you can redistribute it and/or modify it | 8 | * This program is free software; you can redistribute it and/or modify it |
9 | * under the terms and conditions of the GNU General Public License, | 9 | * under the terms and conditions of the GNU General Public License, |
@@ -38,13 +38,20 @@ static int gk20a_init_therm_setup_hw(struct gk20a *g) | |||
38 | u32 v; | 38 | u32 v; |
39 | 39 | ||
40 | /* program NV_THERM registers */ | 40 | /* program NV_THERM registers */ |
41 | gk20a_writel(g, therm_use_a_r(), NV_THERM_USE_A_INIT); | 41 | gk20a_writel(g, therm_use_a_r(), therm_use_a_ext_therm_0_enable_f() | |
42 | therm_use_a_ext_therm_1_enable_f() | | ||
43 | therm_use_a_ext_therm_2_enable_f()); | ||
44 | /* priority for EXT_THERM_0 event set to highest */ | ||
42 | gk20a_writel(g, therm_evt_ext_therm_0_r(), | 45 | gk20a_writel(g, therm_evt_ext_therm_0_r(), |
43 | NV_THERM_EVT_EXT_THERM_0_INIT); | 46 | therm_evt_ext_therm_0_slow_factor_f(1) | |
47 | therm_evt_ext_therm_0_priority_f(3)); | ||
44 | gk20a_writel(g, therm_evt_ext_therm_1_r(), | 48 | gk20a_writel(g, therm_evt_ext_therm_1_r(), |
45 | NV_THERM_EVT_EXT_THERM_1_INIT); | 49 | therm_evt_ext_therm_1_slow_factor_f(2) | |
50 | therm_evt_ext_therm_1_priority_f(2)); | ||
46 | gk20a_writel(g, therm_evt_ext_therm_2_r(), | 51 | gk20a_writel(g, therm_evt_ext_therm_2_r(), |
47 | NV_THERM_EVT_EXT_THERM_2_INIT); | 52 | therm_evt_ext_therm_2_slow_factor_f(3) | |
53 | therm_evt_ext_therm_2_priority_f(1)); | ||
54 | |||
48 | 55 | ||
49 | gk20a_writel(g, therm_grad_stepping_table_r(0), | 56 | gk20a_writel(g, therm_grad_stepping_table_r(0), |
50 | therm_grad_stepping_table_slowdown_factor0_f(therm_grad_stepping_table_slowdown_factor0_fpdiv_by1p5_f()) | | 57 | therm_grad_stepping_table_slowdown_factor0_f(therm_grad_stepping_table_slowdown_factor0_fpdiv_by1p5_f()) | |
@@ -92,9 +99,15 @@ int gk20a_init_therm_support(struct gk20a *g) | |||
92 | if (err) | 99 | if (err) |
93 | return err; | 100 | return err; |
94 | 101 | ||
95 | err = gk20a_init_therm_setup_hw(g); | 102 | if (g->ops.therm.init_therm_setup_hw) |
103 | err = g->ops.therm.init_therm_setup_hw(g); | ||
96 | if (err) | 104 | if (err) |
97 | return err; | 105 | return err; |
98 | 106 | ||
99 | return err; | 107 | return err; |
100 | } | 108 | } |
109 | |||
110 | void gk20a_init_therm_ops(struct gpu_ops *gops) | ||
111 | { | ||
112 | gops->therm.init_therm_setup_hw = gk20a_init_therm_setup_hw; | ||
113 | } | ||
diff --git a/drivers/gpu/nvgpu/gk20a/therm_gk20a.h b/drivers/gpu/nvgpu/gk20a/therm_gk20a.h index e670ec0e..80671d68 100644 --- a/drivers/gpu/nvgpu/gk20a/therm_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/therm_gk20a.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2011 - 2014, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2011 - 2015, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -16,13 +16,8 @@ | |||
16 | #ifndef THERM_GK20A_H | 16 | #ifndef THERM_GK20A_H |
17 | #define THERM_GK20A_H | 17 | #define THERM_GK20A_H |
18 | 18 | ||
19 | /* priority for EXT_THERM_0 event set to highest */ | 19 | struct gpu_ops; |
20 | #define NV_THERM_EVT_EXT_THERM_0_INIT 0x3000100 | 20 | void gk20a_init_therm_ops(struct gpu_ops *gops); |
21 | #define NV_THERM_EVT_EXT_THERM_1_INIT 0x2000200 | ||
22 | #define NV_THERM_EVT_EXT_THERM_2_INIT 0x1000300 | ||
23 | /* configures the thermal events that may cause clock slowdown */ | ||
24 | #define NV_THERM_USE_A_INIT 0x7 | ||
25 | 21 | ||
26 | int gk20a_init_therm_support(struct gk20a *g); | 22 | int gk20a_init_therm_support(struct gk20a *g); |
27 | |||
28 | #endif /* THERM_GK20A_H */ | 23 | #endif /* THERM_GK20A_H */ |