diff options
author | Richard Zhao <rizhao@nvidia.com> | 2018-04-20 18:17:13 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-04-25 12:36:53 -0400 |
commit | 3d0ddb8c4a735cc0c321ddef935f5c3eaad08660 (patch) | |
tree | 2568629c3867968a6c65c381a909cb2a36faea2d /drivers/gpu/nvgpu/gk20a/mm_gk20a.h | |
parent | 98dce7eaac374ccd5c4d7cf6d76decc4e9cd3896 (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/gk20a/mm_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.h | 6 |
1 files changed, 2 insertions, 4 deletions
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 @@ | |||
1 | /* | 1 | /* |
2 | * GK20A memory management | 2 | * GK20A memory management |
3 | * | 3 | * |
4 | * Copyright (c) 2011-2017, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2011-2018, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * Permission is hereby granted, free of charge, to any person obtaining a | 6 | * Permission is hereby granted, free of charge, to any person obtaining a |
7 | * copy of this software and associated documentation files (the "Software"), | 7 | * copy of this software and associated documentation files (the "Software"), |
@@ -165,9 +165,7 @@ void gk20a_locked_gmmu_unmap(struct vm_gk20a *vm, | |||
165 | struct nvgpu_as_alloc_space_args; | 165 | struct nvgpu_as_alloc_space_args; |
166 | struct nvgpu_as_free_space_args; | 166 | struct nvgpu_as_free_space_args; |
167 | int gk20a_vm_release_share(struct gk20a_as_share *as_share); | 167 | int gk20a_vm_release_share(struct gk20a_as_share *as_share); |
168 | int gk20a_vm_bind_channel(struct gk20a_as_share *as_share, | 168 | int gk20a_vm_bind_channel(struct vm_gk20a *vm, struct channel_gk20a *ch); |
169 | struct channel_gk20a *ch); | ||
170 | int __gk20a_vm_bind_channel(struct vm_gk20a *vm, struct channel_gk20a *ch); | ||
171 | 169 | ||
172 | void pde_range_from_vaddr_range(struct vm_gk20a *vm, | 170 | void pde_range_from_vaddr_range(struct vm_gk20a *vm, |
173 | u64 addr_lo, u64 addr_hi, | 171 | u64 addr_lo, u64 addr_hi, |