diff options
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hw_pbdma_gp10b.h | 22 |
2 files changed, 23 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c index 8c53978b..ade6ff0a 100644 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GP10B fifo | 2 | * GP10B fifo |
3 | * | 3 | * |
4 | * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
7 | * under the terms and conditions of the GNU General Public License, | 7 | * under the terms and conditions of the GNU General Public License, |
@@ -122,11 +122,7 @@ static int channel_gp10b_setup_ramfc(struct channel_gk20a *c, | |||
122 | gk20a_mem_wr32(inst_ptr, ram_fc_target_w(), pbdma_target_engine_sw_f()); | 122 | gk20a_mem_wr32(inst_ptr, ram_fc_target_w(), pbdma_target_engine_sw_f()); |
123 | 123 | ||
124 | gk20a_mem_wr32(inst_ptr, ram_fc_acquire_w(), | 124 | gk20a_mem_wr32(inst_ptr, ram_fc_acquire_w(), |
125 | pbdma_acquire_retry_man_2_f() | | 125 | channel_gk20a_pbdma_acquire_val(c)); |
126 | pbdma_acquire_retry_exp_2_f() | | ||
127 | pbdma_acquire_timeout_exp_max_f() | | ||
128 | pbdma_acquire_timeout_man_max_f() | | ||
129 | pbdma_acquire_timeout_en_disable_f()); | ||
130 | 126 | ||
131 | gk20a_mem_wr32(inst_ptr, ram_fc_runlist_timeslice_w(), | 127 | gk20a_mem_wr32(inst_ptr, ram_fc_runlist_timeslice_w(), |
132 | pbdma_runlist_timeslice_timeout_128_f() | | 128 | pbdma_runlist_timeslice_timeout_128_f() | |
diff --git a/drivers/gpu/nvgpu/gp10b/hw_pbdma_gp10b.h b/drivers/gpu/nvgpu/gp10b/hw_pbdma_gp10b.h index d3f97a44..f66fa934 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_pbdma_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/hw_pbdma_gp10b.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; |