diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2018-06-12 22:04:02 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-06-15 00:42:30 -0400 |
commit | 000b10782deb1ff854fb0a1d0224ff218bfe25ae (patch) | |
tree | 6fc006b3967b987b663bebf7c683baa3dd6c7ecd /drivers/gpu/nvgpu/include | |
parent | a42c0ab9352e6017cbc1f53dad51d01496bb6acd (diff) |
gpu: nvgpu: deprecate fb flush timeout registers
FB flush timeout is deprecated in h/w and we use memop timeout instead
which has same bits in the register
Hence remove fb flush timeout accessors and use memop timeout ones
Jira NVGPUT-50
Change-Id: Ia4696275f721f28cbb7e300889c4d70aaf0824ef
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1747956
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/include')
-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 |
2 files changed, 6 insertions, 6 deletions
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 | } |