summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2014-09-08 01:16:18 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:11:14 -0400
commit27b94dfafdb0903981ebc437abda85ffdb828668 (patch)
treec57175fa32d7e1099c9008a5640273611f19ef9e /drivers
parent20f9424705258fdb0c34d0df352c2b81fa858c2d (diff)
gpu: nvgpu: Disable illegal compstat access intr
Disable illegal compstat access interrupt. We access compstat backing store to handle CDE swizzling. Also change the magic number for evicted_cb to use a generated value. Change-Id: I79b299abbffcb90497690ba4fc55d8517a3dbd87 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/496444 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Arto Merilainen <amerilainen@nvidia.com> Reviewed-by: Jussi Rasanen <jrasanen@nvidia.com> Tested-by: Jussi Rasanen <jrasanen@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/gm20b/hw_ltc_gm20b.h4
-rw-r--r--drivers/gpu/nvgpu/gm20b/ltc_gm20b.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/hw_ltc_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_ltc_gm20b.h
index 8cef53d6..467bd665 100644
--- a/drivers/gpu/nvgpu/gm20b/hw_ltc_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hw_ltc_gm20b.h
@@ -278,6 +278,10 @@ static inline u32 ltc_ltcs_ltss_intr_en_evicted_cb_m(void)
278{ 278{
279 return 0x1 << 20; 279 return 0x1 << 20;
280} 280}
281static inline u32 ltc_ltcs_ltss_intr_en_illegal_compstat_access_m(void)
282{
283 return 0x1 << 30;
284}
281static inline u32 ltc_ltc0_lts0_intr_r(void) 285static inline u32 ltc_ltc0_lts0_intr_r(void)
282{ 286{
283 return 0x0014040c; 287 return 0x0014040c;
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
index 788cff6b..6e9d6ffe 100644
--- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
@@ -192,7 +192,8 @@ static void gm20b_ltc_init_fs_state(struct gk20a *g)
192 192
193 /* Disable LTC interrupts */ 193 /* Disable LTC interrupts */
194 reg = gk20a_readl(g, ltc_ltcs_ltss_intr_r()); 194 reg = gk20a_readl(g, ltc_ltcs_ltss_intr_r());
195 reg &= ~(1<<20); 195 reg &= ~ltc_ltcs_ltss_intr_en_evicted_cb_m();
196 reg &= ~ltc_ltcs_ltss_intr_en_illegal_compstat_access_m();
196 gk20a_writel(g, ltc_ltcs_ltss_intr_r(), reg); 197 gk20a_writel(g, ltc_ltcs_ltss_intr_r(), reg);
197} 198}
198 199