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/gk20a/mm_gk20a.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/mm_gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h index 14629611..55d74435 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h @@ -1,7 +1,7 @@ /* * GK20A memory management * - * Copyright (c) 2011-2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2011-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -165,9 +165,7 @@ void gk20a_locked_gmmu_unmap(struct vm_gk20a *vm, struct nvgpu_as_alloc_space_args; struct nvgpu_as_free_space_args; int gk20a_vm_release_share(struct gk20a_as_share *as_share); -int gk20a_vm_bind_channel(struct gk20a_as_share *as_share, - struct channel_gk20a *ch); -int __gk20a_vm_bind_channel(struct vm_gk20a *vm, struct channel_gk20a *ch); +int gk20a_vm_bind_channel(struct vm_gk20a *vm, struct channel_gk20a *ch); void pde_range_from_vaddr_range(struct vm_gk20a *vm, u64 addr_lo, u64 addr_hi, -- cgit v1.2.2