diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2017-02-16 06:31:03 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-02-21 14:13:42 -0500 |
commit | 00ba4c0b0b2e8ded7349f419cbfdaf7b124af4b1 (patch) | |
tree | 683dd08ccbf49dfaf99404f37e64fa8b962036dc /drivers/gpu | |
parent | c218fefe848893c9e4fa6b44ac65439444e47b04 (diff) |
gpu: nvgpu: assign ce_ctx->vm during ctx creation
Commit 7e403974d3584ab8880e42d422ee3afb7f49d6f3 ("gpu: nvgpu: Simplify
ref-counting on VMs") accidentally broke the CE context creation while
moving away from direct ch->vm assignments. ce_ctx->vm isn't part of
that simplification, so initialize it because it's used elsewhere and
were left NULL.
Bug 1846718
Change-Id: I6219880227b881d2175005b7eaf6e6e08a6f888e
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/1306221
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c index 62b0a05e..023c959e 100644 --- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | |||
@@ -441,6 +441,8 @@ u32 gk20a_ce_create_context_with_cb(struct device *dev, | |||
441 | ce_ctx->submitted_seq_number = 0; | 441 | ce_ctx->submitted_seq_number = 0; |
442 | ce_ctx->completed_seq_number = 0; | 442 | ce_ctx->completed_seq_number = 0; |
443 | 443 | ||
444 | ce_ctx->vm = &g->mm.ce.vm; | ||
445 | |||
444 | /* always kernel client needs privileged channel */ | 446 | /* always kernel client needs privileged channel */ |
445 | ce_ctx->ch = gk20a_open_new_channel_with_cb(g, gk20a_ce_finished_ctx_cb, | 447 | ce_ctx->ch = gk20a_open_new_channel_with_cb(g, gk20a_ce_finished_ctx_cb, |
446 | ce_ctx, | 448 | ce_ctx, |