summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common
diff options
context:
space:
mode:
authorRichard Zhao <rizhao@nvidia.com>2018-04-20 18:17:13 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-04-25 12:36:53 -0400
commit3d0ddb8c4a735cc0c321ddef935f5c3eaad08660 (patch)
tree2568629c3867968a6c65c381a909cb2a36faea2d /drivers/gpu/nvgpu/common
parent98dce7eaac374ccd5c4d7cf6d76decc4e9cd3896 (diff)
gpu: nvgpu: move parameter of .vm_bind_channel from as_share to vm
as_share is more os specific and not yet used on other OSes. Jira VQRM-2344 Change-Id: Ie2ed007125400484352fbab602c37a198e8a64ae Signed-off-by: Richard Zhao <rizhao@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1699842 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r--drivers/gpu/nvgpu/common/linux/cde.c2
-rw-r--r--drivers/gpu/nvgpu/common/linux/ioctl_as.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/cde.c b/drivers/gpu/nvgpu/common/linux/cde.c
index f3895d5c..7c92246c 100644
--- a/drivers/gpu/nvgpu/common/linux/cde.c
+++ b/drivers/gpu/nvgpu/common/linux/cde.c
@@ -1306,7 +1306,7 @@ static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx)
1306 } 1306 }
1307 1307
1308 /* bind the channel to the vm */ 1308 /* bind the channel to the vm */
1309 err = __gk20a_vm_bind_channel(g->mm.cde.vm, ch); 1309 err = g->ops.mm.vm_bind_channel(g->mm.cde.vm, ch);
1310 if (err) { 1310 if (err) {
1311 nvgpu_warn(g, "cde: could not bind vm"); 1311 nvgpu_warn(g, "cde: could not bind vm");
1312 goto err_commit_va; 1312 goto err_commit_va;
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_as.c b/drivers/gpu/nvgpu/common/linux/ioctl_as.c
index 7559499e..e09e099b 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_as.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_as.c
@@ -63,7 +63,7 @@ static int gk20a_as_ioctl_bind_channel(
63 } 63 }
64 64
65 /* this will set channel_gk20a->vm */ 65 /* this will set channel_gk20a->vm */
66 err = ch->g->ops.mm.vm_bind_channel(as_share, ch); 66 err = ch->g->ops.mm.vm_bind_channel(as_share->vm, ch);
67 67
68out: 68out:
69 gk20a_channel_put(ch); 69 gk20a_channel_put(ch);