summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_gk20a.c1
-rw-r--r--drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h6
-rw-r--r--drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h6
3 files changed, 11 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index dbaa520d..a96bc4e1 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -4115,6 +4115,7 @@ static int gk20a_init_gr_setup_hw(struct gk20a *g)
4115 4115
4116 /* enable fecs error interrupts */ 4116 /* enable fecs error interrupts */
4117 gk20a_writel(g, gr_fecs_host_int_enable_r(), 4117 gk20a_writel(g, gr_fecs_host_int_enable_r(),
4118 gr_fecs_host_int_enable_ctxsw_intr1_enable_f() |
4118 gr_fecs_host_int_enable_fault_during_ctxsw_enable_f() | 4119 gr_fecs_host_int_enable_fault_during_ctxsw_enable_f() |
4119 gr_fecs_host_int_enable_umimp_firmware_method_enable_f() | 4120 gr_fecs_host_int_enable_umimp_firmware_method_enable_f() |
4120 gr_fecs_host_int_enable_umimp_illegal_method_enable_f() | 4121 gr_fecs_host_int_enable_umimp_illegal_method_enable_f() |
diff --git a/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h
index a73209f2..b9d083e3 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2014-2016, 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,
@@ -934,6 +934,10 @@ static inline u32 gr_fecs_host_int_enable_r(void)
934{ 934{
935 return 0x00409c24; 935 return 0x00409c24;
936} 936}
937static inline u32 gr_fecs_host_int_enable_ctxsw_intr1_enable_f(void)
938{
939 return 0x2;
940}
937static inline u32 gr_fecs_host_int_enable_fault_during_ctxsw_enable_f(void) 941static inline u32 gr_fecs_host_int_enable_fault_during_ctxsw_enable_f(void)
938{ 942{
939 return 0x10000; 943 return 0x10000;
diff --git a/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h
index 7a19e4ab..696f518c 100644
--- a/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2014-2016, 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,
@@ -946,6 +946,10 @@ static inline u32 gr_fecs_host_int_enable_r(void)
946{ 946{
947 return 0x00409c24; 947 return 0x00409c24;
948} 948}
949static inline u32 gr_fecs_host_int_enable_ctxsw_intr1_enable_f(void)
950{
951 return 0x2;
952}
949static inline u32 gr_fecs_host_int_enable_fault_during_ctxsw_enable_f(void) 953static inline u32 gr_fecs_host_int_enable_fault_during_ctxsw_enable_f(void)
950{ 954{
951 return 0x10000; 955 return 0x10000;