diff options
author | Arto Merilainen <amerilainen@nvidia.com> | 2014-08-20 17:02:59 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:11:01 -0400 |
commit | c8a0edc2255a0c4a0a97657fda989216a7e982d4 (patch) | |
tree | 61458c7628660157d43563f9bf73d462e50a56a2 /drivers/gpu/nvgpu/gm20b | |
parent | 9635e19e618b2897d27a21a240110289d424c99e (diff) |
TEMP: gpu: nvgpu: gm20b: Mask LTC interrupts
LTC interrputs were set to random values at boot. For now, disable
all interrupts.
Change-Id: Ibb032cac91d3ea9a951fd8c2eb62a783af5bd1a1
Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-on: http://git-master/r/482639
Reviewed-by: Lauri Peltonen <lpeltonen@nvidia.com>
Tested-by: Lauri Peltonen <lpeltonen@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hw_ltc_gm20b.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/hw_ltc_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_ltc_gm20b.h index 3698a30e..1bc024be 100644 --- a/drivers/gpu/nvgpu/gm20b/hw_ltc_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/hw_ltc_gm20b.h | |||
@@ -122,6 +122,10 @@ static inline u32 ltc_ltcs_ltss_cbc_ctrl2_clear_lower_bound_f(u32 v) | |||
122 | { | 122 | { |
123 | return (v & 0x1ffff) << 0; | 123 | return (v & 0x1ffff) << 0; |
124 | } | 124 | } |
125 | static inline u32 ltc_ltcs_ltss_intr_r(void) | ||
126 | { | ||
127 | return 0x0017e20c; | ||
128 | } | ||
125 | static inline u32 ltc_ltcs_ltss_cbc_ctrl3_r(void) | 129 | static inline u32 ltc_ltcs_ltss_cbc_ctrl3_r(void) |
126 | { | 130 | { |
127 | return 0x0017e274; | 131 | return 0x0017e274; |
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c index f749279c..c265df02 100644 --- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | |||
@@ -186,6 +186,9 @@ static void gm20b_ltc_init_fs_state(struct gk20a *g) | |||
186 | gk20a_writel(g, ltc_ltcs_ltss_dstg_cfg0_r(), | 186 | gk20a_writel(g, ltc_ltcs_ltss_dstg_cfg0_r(), |
187 | gk20a_readl(g, ltc_ltc0_lts0_dstg_cfg0_r()) | | 187 | gk20a_readl(g, ltc_ltc0_lts0_dstg_cfg0_r()) | |
188 | ltc_ltcs_ltss_dstg_cfg0_vdc_4to2_disable_m()); | 188 | ltc_ltcs_ltss_dstg_cfg0_vdc_4to2_disable_m()); |
189 | |||
190 | /* Disable LTC interrupts */ | ||
191 | gk20a_writel(g, ltc_ltcs_ltss_intr_r(), 0); | ||
189 | } | 192 | } |
190 | 193 | ||
191 | void gm20b_ltc_isr(struct gk20a *g) | 194 | void gm20b_ltc_isr(struct gk20a *g) |