summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
diff options
context:
space:
mode:
authorKonsta Holtta <kholtta@nvidia.com>2017-10-06 03:49:19 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-10-10 19:26:53 -0400
commit9b20f2a15e7cd4e3e99034e02cc768321ac35969 (patch)
tree8a5214508ec5c73124c8d2bd06a05ef7f629ace1 /drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
parentb41e1417787aabf8e2d37f3259bce2a4ad041607 (diff)
gpu: nvgpu: report GR_SEMAPHORE_TIMEOUT on PBDMA sema timeout
As with GR's semaphore acquires that timeout, report NVGPU_CHANNEL_GR_SEMAPHORE_TIMEOUT to userspace in the error notifier also when a semaphore acquire timeout interrupt is received from PBDMA. This timeout is used when the kernel watchdog timer is enabled. Bug 1782480 Change-Id: I1ceb8632548c5e89febb2b80a5850116a2d4b670 Signed-off-by: Konsta Holtta <kholtta@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1574293 Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com> Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/fifo_gk20a.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index 9eb2204d..848e5123 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -2341,6 +2341,7 @@ unsigned int gk20a_fifo_handle_pbdma_intr_0(struct gk20a *g, u32 pbdma_id,
2341 rc_type = RC_TYPE_PBDMA_FAULT; 2341 rc_type = RC_TYPE_PBDMA_FAULT;
2342 nvgpu_err(g, 2342 nvgpu_err(g,
2343 "semaphore acquire timeout!"); 2343 "semaphore acquire timeout!");
2344 *error_notifier = NVGPU_CHANNEL_GR_SEMAPHORE_TIMEOUT;
2344 } 2345 }
2345 *handled |= pbdma_intr_0_acquire_pending_f(); 2346 *handled |= pbdma_intr_0_acquire_pending_f();
2346 } 2347 }