From 3d0ddb8c4a735cc0c321ddef935f5c3eaad08660 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Fri, 20 Apr 2018 15:17:13 -0700 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1699842 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/cde.c | 2 +- drivers/gpu/nvgpu/common/linux/ioctl_as.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/common') 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) } /* bind the channel to the vm */ - err = __gk20a_vm_bind_channel(g->mm.cde.vm, ch); + err = g->ops.mm.vm_bind_channel(g->mm.cde.vm, ch); if (err) { nvgpu_warn(g, "cde: could not bind vm"); 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( } /* this will set channel_gk20a->vm */ - err = ch->g->ops.mm.vm_bind_channel(as_share, ch); + err = ch->g->ops.mm.vm_bind_channel(as_share->vm, ch); out: gk20a_channel_put(ch); -- cgit v1.2.2