diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2020-07-07 06:17:00 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2020-07-14 05:40:09 -0400 |
commit | e878686302f126fc09d336310651ebe0f857576c (patch) | |
tree | 98aefbee1ddd38dd2c3fade1138bdc50ca29f5ae /drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |
parent | 1b161b6c7a43f95f3b135d18efa97a8429300617 (diff) |
gpu: nvgpu: wait ACK for FECS watchdog timeout
On Volta, nvgpu needs to wait for explicit ACK from CTXSW while
setting FECS watchdog timeoout
This is manual port of the fixes 4d7e5026e38528b88a4a168eca9a8b180475b368
and ad89436b03428a42e43042b6a849c15843fdebc4 on dev-main since clean
cherry-pick is not possible due to huge file and structure differences.
Bug 200603566
Change-Id: Icba69998ab45eee5fdf2a29e1ac1067589301be6
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2371708
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/hal_gv11b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index a2384fc8..c0f7e4e3 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -452,6 +452,7 @@ static const struct gpu_ops gv11b_ops = { | |||
452 | .get_offset_in_gpccs_segment = | 452 | .get_offset_in_gpccs_segment = |
453 | gr_gk20a_get_offset_in_gpccs_segment, | 453 | gr_gk20a_get_offset_in_gpccs_segment, |
454 | .set_debug_mode = gm20b_gr_set_debug_mode, | 454 | .set_debug_mode = gm20b_gr_set_debug_mode, |
455 | .set_fecs_watchdog_timeout = gr_gv11b_set_fecs_watchdog_timeout, | ||
455 | }, | 456 | }, |
456 | .fb = { | 457 | .fb = { |
457 | .init_hw = gv11b_fb_init_hw, | 458 | .init_hw = gv11b_fb_init_hw, |