diff options
author | Alex Waterman <alexw@nvidia.com> | 2016-11-08 14:31:05 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-01-04 18:53:56 -0500 |
commit | c116522b10a253f68dab8bf89c34a8b9e1be51b9 (patch) | |
tree | 300c02e23d4dbf3d989e9bffd9ae77ea4fbf7d43 /drivers/gpu/nvgpu/gk20a/gk20a.h | |
parent | 9e2f7d98d4cf2845d3dfea1653f3d6bedd4fb1e6 (diff) |
gpu: nvgpu: Handle driver shutdown more gracefully
Handle possible asynchronous GPU driver shutdown more gracefully.
This occurs when the GPU disappears from the PCI bus, for example,
if it overheats or detects an over current event.
Also add a preprocessor check to make sure that the
gk20a_channel_cancel_pending_sema_waits()
is always defined. In some builds CONFIG_SYNC is disabled but the
gk20a_remove_support() code does not check for this.
Bug 1816516
Bug 1807277
Change-Id: I932e312291c5c6a6ac5e13525ce8ca56a1be3652
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1250028
(cherry picked from commit 337810f8c478238a38d8553c1492622d5fa9aafa)
Reviewed-on: http://git-master/r/1274476
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index e8c1b30f..dc130e33 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -1081,6 +1081,7 @@ enum gk20a_dbg_categories { | |||
1081 | gpu_dbg_sema_v = BIT(16), /* verbose semaphore debugging */ | 1081 | gpu_dbg_sema_v = BIT(16), /* verbose semaphore debugging */ |
1082 | gpu_dbg_pmu_pstate = BIT(17), /* p state controlled by pmu */ | 1082 | gpu_dbg_pmu_pstate = BIT(17), /* p state controlled by pmu */ |
1083 | gpu_dbg_xv = BIT(18), /* XVE debugging */ | 1083 | gpu_dbg_xv = BIT(18), /* XVE debugging */ |
1084 | gpu_dbg_shutdown = BIT(19), /* GPU shutdown tracing */ | ||
1084 | gpu_dbg_mem = BIT(31), /* memory accesses, very verbose */ | 1085 | gpu_dbg_mem = BIT(31), /* memory accesses, very verbose */ |
1085 | }; | 1086 | }; |
1086 | 1087 | ||