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>

diff --git a/drivers/gpu/nvgpu/gm20b/hw_ltc_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_ltc_gm20b.h
index 8cef53d6bc9d96e71f30cad562445f5c3657f207..467bd665351c6d939e944c60604d90d35a2f075d 100644 (file)
--- 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 788cff6b949975f6c0327a88146536443daa2ae3..6e9d6ffea5f3d934c99951608113282f3e99c7ec 100644 (file)
--- 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);
 }