diff options
author | Seema Khowala <seemaj@nvidia.com> | 2017-03-22 12:24:19 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-03-23 20:18:28 -0400 |
commit | 17df1921807a190d24dbd5b0e0f78192c2e3b772 (patch) | |
tree | 9f76ed1e5762e1e2cf57a374fb6cd39facf50af4 /drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |
parent | df94d474a8200fc61969e2fc35d1b2a8d7fa5b8c (diff) |
gpu: nvgpu: gr faults: do not depend on fake mmu fault notifier
Currently NVGPU_CHANNEL_FIFO_ERROR_MMU_ERR_FLT is being set in
error notifier for non mmu fault too. For fake mmu faults i.e.
trigger mmu fault cases, make sure proper notifiers are set and
driver is not depending on sending mmu error fault notifier.
This change is needed for t19x fifo recovery too.
NVGPU_CHANNEL_GR_ERROR_SW_METHOD (12), NVGPU_CHANNEL_GR_EXCEPTION(13)
and NVGPU_CHANNEL_FECS_ERR_UNIMP_FIRMWARE_METHOD (37) are new error
notifiers.
JIRA GPUT19X-7
Change-Id: Idee83e842c835bdba9eb18578aad0c372ea74c5d
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: http://git-master/r/1310563
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index b4589eaa..ad69cd79 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -3272,7 +3272,10 @@ u32 gk20a_fifo_get_pbdma_signature(struct gk20a *g) | |||
3272 | struct channel_gk20a *gk20a_fifo_channel_from_hw_chid(struct gk20a *g, | 3272 | struct channel_gk20a *gk20a_fifo_channel_from_hw_chid(struct gk20a *g, |
3273 | u32 hw_chid) | 3273 | u32 hw_chid) |
3274 | { | 3274 | { |
3275 | return g->fifo.channel + hw_chid; | 3275 | if (hw_chid != FIFO_INVAL_CHANNEL_ID) |
3276 | return g->fifo.channel + hw_chid; | ||
3277 | else | ||
3278 | return NULL; | ||
3276 | } | 3279 | } |
3277 | 3280 | ||
3278 | #ifdef CONFIG_DEBUG_FS | 3281 | #ifdef CONFIG_DEBUG_FS |