From b8ba88239913a9044ea0eb0773fce47fb831760b Mon Sep 17 00:00:00 2001 From: Antoine Chauveau Date: Fri, 17 May 2019 11:12:10 +0300 Subject: [PATCH] gpu: nvgpu: Remove assertion which triggers intermittently Partially revert patch c0e725a, which causes intermittent test failures. Bug 2599340 Change-Id: I4ac7ef007b4a7beaa2010cc3795ed0f78b4ce9c7 Signed-off-by: Antoine Chauveau Reviewed-on: https://git-master.nvidia.com/r/2120867 --- drivers/gpu/nvgpu/common/fifo/channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/nvgpu/common/fifo/channel.c b/drivers/gpu/nvgpu/common/fifo/channel.c index 4bec0235c..70f1ca37f 100644 --- a/drivers/gpu/nvgpu/common/fifo/channel.c +++ b/drivers/gpu/nvgpu/common/fifo/channel.c @@ -2455,7 +2455,7 @@ int nvgpu_channel_suspend_all_serviceable_ch(struct gk20a *g) nvgpu_err(g, "failed to disable channel/TSG"); } /* preempt the channel */ - nvgpu_assert(nvgpu_preempt_channel(g, ch) == 0); + nvgpu_preempt_channel(g, ch); /* wait for channel update notifiers */ if (g->os_channel.work_completion_cancel_sync != NULL) { g->os_channel.work_completion_cancel_sync(ch);