diff options
author | Richard Zhao <rizhao@nvidia.com> | 2016-01-04 13:28:04 -0500 |
---|---|---|
committer | Vladislav Buzov <vbuzov@nvidia.com> | 2016-01-10 23:07:53 -0500 |
commit | a9c6f595399074e88c16f3557e5acb29db1d52d5 (patch) | |
tree | 2d2665668bac915b5598d83881a1efec892be435 /drivers/gpu/nvgpu/gm20b | |
parent | 3484fd0d1365c6f97723d97cb45664aa75c45f32 (diff) |
gpu: nvgpu: enable semaphore acquire timeout
It'll detect dead semaphore acquire. The worst case is when
ACQUIRE_SWITCH is disabled, semaphore acquire will poll and
consume full gpu timeslicees.
The timeout value is set to half of channel WDT.
Bug 1636800
Change-Id: Ida6ccc534006a191513edf47e7b82d4b5b758684
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: http://git-master/r/928827
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vladislav Buzov <vbuzov@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hw_pbdma_gm20b.h | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/hw_pbdma_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_pbdma_gm20b.h index c03a377a..19b3bc44 100644 --- a/drivers/gpu/nvgpu/gm20b/hw_pbdma_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/hw_pbdma_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, |
@@ -262,14 +262,34 @@ static inline u32 pbdma_acquire_retry_exp_2_f(void) | |||
262 | { | 262 | { |
263 | return 0x100; | 263 | return 0x100; |
264 | } | 264 | } |
265 | static inline u32 pbdma_acquire_timeout_exp_f(u32 v) | ||
266 | { | ||
267 | return (v & 0xf) << 11; | ||
268 | } | ||
269 | static inline u32 pbdma_acquire_timeout_exp_max_v(void) | ||
270 | { | ||
271 | return 0x0000000f; | ||
272 | } | ||
265 | static inline u32 pbdma_acquire_timeout_exp_max_f(void) | 273 | static inline u32 pbdma_acquire_timeout_exp_max_f(void) |
266 | { | 274 | { |
267 | return 0x7800; | 275 | return 0x7800; |
268 | } | 276 | } |
277 | static inline u32 pbdma_acquire_timeout_man_f(u32 v) | ||
278 | { | ||
279 | return (v & 0xffff) << 15; | ||
280 | } | ||
281 | static inline u32 pbdma_acquire_timeout_man_max_v(void) | ||
282 | { | ||
283 | return 0x0000ffff; | ||
284 | } | ||
269 | static inline u32 pbdma_acquire_timeout_man_max_f(void) | 285 | static inline u32 pbdma_acquire_timeout_man_max_f(void) |
270 | { | 286 | { |
271 | return 0x7fff8000; | 287 | return 0x7fff8000; |
272 | } | 288 | } |
289 | static inline u32 pbdma_acquire_timeout_en_enable_f(void) | ||
290 | { | ||
291 | return 0x80000000; | ||
292 | } | ||
273 | static inline u32 pbdma_acquire_timeout_en_disable_f(void) | 293 | static inline u32 pbdma_acquire_timeout_en_disable_f(void) |
274 | { | 294 | { |
275 | return 0x0; | 295 | return 0x0; |