From 27b94dfafdb0903981ebc437abda85ffdb828668 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Mon, 8 Sep 2014 08:16:18 +0300 Subject: 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 Reviewed-on: http://git-master/r/496444 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Arto Merilainen Reviewed-by: Jussi Rasanen Tested-by: Jussi Rasanen --- drivers/gpu/nvgpu/gm20b/hw_ltc_gm20b.h | 4 ++++ drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/gm20b') 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) { return 0x1 << 20; } +static inline u32 ltc_ltcs_ltss_intr_en_illegal_compstat_access_m(void) +{ + return 0x1 << 30; +} static inline u32 ltc_ltc0_lts0_intr_r(void) { 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) /* Disable LTC interrupts */ reg = gk20a_readl(g, ltc_ltcs_ltss_intr_r()); - reg &= ~(1<<20); + reg &= ~ltc_ltcs_ltss_intr_en_evicted_cb_m(); + reg &= ~ltc_ltcs_ltss_intr_en_illegal_compstat_access_m(); gk20a_writel(g, ltc_ltcs_ltss_intr_r(), reg); } -- cgit v1.2.2