diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-07-21 16:11:56 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-07-27 14:14:59 -0400 |
commit | ea180847e146450b53de5c41c3f43b19391b4c5d (patch) | |
tree | ef4782d69605a6632bbc6b19212263d6cb9abf97 /drivers/gpu/nvgpu/gk20a/channel_gk20a.h | |
parent | 1b5035132b8f28cb05a21eca4d2f7a4771e59914 (diff) |
gpu: nvgpu: Fix gr ctx unmap logic
The GR context buffers were not being properly unmapped. The awkward
VPR vs non-VPR context setup requires some extra checks when determining
which nvgpu_mem is associated with what GPU VA (which are tracked
separately in a different sized array).
Change-Id: I4c7be1c5b7835aea4309a142df5b0bdfaae91e4c
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1524689
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h index 46a9b0a7..a9ccd93f 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h | |||
@@ -57,6 +57,7 @@ struct channel_ctx_gk20a { | |||
57 | struct pm_ctx_desc pm_ctx; | 57 | struct pm_ctx_desc pm_ctx; |
58 | u64 global_ctx_buffer_va[NR_GLOBAL_CTX_BUF_VA]; | 58 | u64 global_ctx_buffer_va[NR_GLOBAL_CTX_BUF_VA]; |
59 | u64 global_ctx_buffer_size[NR_GLOBAL_CTX_BUF_VA]; | 59 | u64 global_ctx_buffer_size[NR_GLOBAL_CTX_BUF_VA]; |
60 | int global_ctx_buffer_index[NR_GLOBAL_CTX_BUF_VA]; | ||
60 | bool global_ctx_buffer_mapped; | 61 | bool global_ctx_buffer_mapped; |
61 | struct ctx_header_desc ctx_header; | 62 | struct ctx_header_desc ctx_header; |
62 | }; | 63 | }; |