diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c index a7c6360b..84d63b91 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | |||
@@ -373,7 +373,7 @@ u32 gv11b_fifo_intr_0_error_mask(struct gk20a *g) | |||
373 | fifo_intr_0_bind_error_pending_f() | | 373 | fifo_intr_0_bind_error_pending_f() | |
374 | fifo_intr_0_sched_error_pending_f() | | 374 | fifo_intr_0_sched_error_pending_f() | |
375 | fifo_intr_0_chsw_error_pending_f() | | 375 | fifo_intr_0_chsw_error_pending_f() | |
376 | fifo_intr_0_fb_flush_timeout_pending_f() | | 376 | fifo_intr_0_memop_timeout_pending_f() | |
377 | fifo_intr_0_lb_error_pending_f(); | 377 | fifo_intr_0_lb_error_pending_f(); |
378 | 378 | ||
379 | return intr_0_error_mask; | 379 | return intr_0_error_mask; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h index 743afb1e..ac936181 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -208,11 +208,11 @@ static inline u32 fifo_intr_0_chsw_error_reset_f(void) | |||
208 | { | 208 | { |
209 | return 0x10000U; | 209 | return 0x10000U; |
210 | } | 210 | } |
211 | static inline u32 fifo_intr_0_fb_flush_timeout_pending_f(void) | 211 | static inline u32 fifo_intr_0_memop_timeout_pending_f(void) |
212 | { | 212 | { |
213 | return 0x800000U; | 213 | return 0x800000U; |
214 | } | 214 | } |
215 | static inline u32 fifo_intr_0_fb_flush_timeout_reset_f(void) | 215 | static inline u32 fifo_intr_0_memop_timeout_reset_f(void) |
216 | { | 216 | { |
217 | return 0x800000U; | 217 | return 0x800000U; |
218 | } | 218 | } |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h index 59cc7a1d..cb8bf611 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -208,11 +208,11 @@ static inline u32 fifo_intr_0_chsw_error_reset_f(void) | |||
208 | { | 208 | { |
209 | return 0x10000U; | 209 | return 0x10000U; |
210 | } | 210 | } |
211 | static inline u32 fifo_intr_0_fb_flush_timeout_pending_f(void) | 211 | static inline u32 fifo_intr_0_memop_timeout_pending_f(void) |
212 | { | 212 | { |
213 | return 0x800000U; | 213 | return 0x800000U; |
214 | } | 214 | } |
215 | static inline u32 fifo_intr_0_fb_flush_timeout_reset_f(void) | 215 | static inline u32 fifo_intr_0_memop_timeout_reset_f(void) |
216 | { | 216 | { |
217 | return 0x800000U; | 217 | return 0x800000U; |
218 | } | 218 | } |