diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index eafa17fb..8014fd8c 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -1377,8 +1377,7 @@ bool gk20a_channel_update_and_check_timeout(struct channel_gk20a *ch, | |||
1377 | 1377 | ||
1378 | static u32 gk20a_get_channel_watchdog_timeout(struct channel_gk20a *ch) | 1378 | static u32 gk20a_get_channel_watchdog_timeout(struct channel_gk20a *ch) |
1379 | { | 1379 | { |
1380 | struct gk20a_platform *platform = gk20a_get_platform(ch->g->dev); | 1380 | return ch->g->ch_wdt_timeout_ms; |
1381 | return platform->ch_wdt_timeout_ms; | ||
1382 | } | 1381 | } |
1383 | 1382 | ||
1384 | static u32 get_gp_free_count(struct channel_gk20a *c) | 1383 | static u32 get_gp_free_count(struct channel_gk20a *c) |
@@ -1490,9 +1489,7 @@ static void __gk20a_channel_timeout_start(struct channel_gk20a *ch) | |||
1490 | */ | 1489 | */ |
1491 | static void gk20a_channel_timeout_start(struct channel_gk20a *ch) | 1490 | static void gk20a_channel_timeout_start(struct channel_gk20a *ch) |
1492 | { | 1491 | { |
1493 | struct gk20a_platform *platform = gk20a_get_platform(ch->g->dev); | 1492 | if (!ch->g->timeouts_enabled || !gk20a_get_channel_watchdog_timeout(ch)) |
1494 | |||
1495 | if (!ch->g->timeouts_enabled || !platform->ch_wdt_timeout_ms) | ||
1496 | return; | 1493 | return; |
1497 | 1494 | ||
1498 | if (!ch->wdt_enabled) | 1495 | if (!ch->wdt_enabled) |