diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-05-06 02:45:31 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:09:20 -0400 |
commit | 3cebc5758ade2a99ac31ba06276c3f3eb6f96cf7 (patch) | |
tree | 1bef1c4d0bccebb12bb78b8e7d0cf42e3344870f /drivers/gpu/nvgpu/gk20a/hw_fifo_gk20a.h | |
parent | c8a5d3f908977b55f48e94f31e35e0534c4087cd (diff) |
gpu: nvgpu: Fix sched error and recovery race
Fix race between channel recovery and sched error.
Bug 1499214
Change-Id: If95526c7e374703e8941f1b24d3916384261058e
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/405662
(cherry picked from commit f8092e158294260dd9d041dc7f4d2c1872e02474)
Reviewed-on: http://git-master/r/407571
Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/hw_fifo_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hw_fifo_gk20a.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/hw_fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_fifo_gk20a.h index a39d3c51..5ebb8365 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_fifo_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/hw_fifo_gk20a.h | |||
@@ -230,6 +230,10 @@ static inline u32 fifo_intr_en_0_r(void) | |||
230 | { | 230 | { |
231 | return 0x00002140; | 231 | return 0x00002140; |
232 | } | 232 | } |
233 | static inline u32 fifo_intr_en_0_sched_error_m(void) | ||
234 | { | ||
235 | return 0x1 << 8; | ||
236 | } | ||
233 | static inline u32 fifo_intr_en_1_r(void) | 237 | static inline u32 fifo_intr_en_1_r(void) |
234 | { | 238 | { |
235 | return 0x00002528; | 239 | return 0x00002528; |