summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2020-07-07 06:17:00 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2020-07-14 05:40:09 -0400
commite878686302f126fc09d336310651ebe0f857576c (patch)
tree98aefbee1ddd38dd2c3fade1138bdc50ca29f5ae /drivers/gpu/nvgpu/gm20b/hal_gm20b.c
parent1b161b6c7a43f95f3b135d18efa97a8429300617 (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/gm20b/hal_gm20b.c')
-rw-r--r--drivers/gpu/nvgpu/gm20b/hal_gm20b.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index c470f520..31edf69f 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -332,6 +332,7 @@ static const struct gpu_ops gm20b_ops = {
332 .get_offset_in_gpccs_segment = 332 .get_offset_in_gpccs_segment =
333 gr_gk20a_get_offset_in_gpccs_segment, 333 gr_gk20a_get_offset_in_gpccs_segment,
334 .set_debug_mode = gm20b_gr_set_debug_mode, 334 .set_debug_mode = gm20b_gr_set_debug_mode,
335 .set_fecs_watchdog_timeout = gr_gk20a_set_fecs_watchdog_timeout,
335 }, 336 },
336 .fb = { 337 .fb = {
337 .init_hw = gm20b_fb_init_hw, 338 .init_hw = gm20b_fb_init_hw,