summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/as.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/common/as.c')
-rw-r--r--drivers/gpu/nvgpu/common/as.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/common/as.c b/drivers/gpu/nvgpu/common/as.c
index 5b76cf0e..77f088b7 100644
--- a/drivers/gpu/nvgpu/common/as.c
+++ b/drivers/gpu/nvgpu/common/as.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * GK20A Address Spaces 2 * GK20A Address Spaces
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"),
@@ -34,13 +34,17 @@
34/* dumb allocator... */ 34/* dumb allocator... */
35static int generate_as_share_id(struct gk20a_as *as) 35static int generate_as_share_id(struct gk20a_as *as)
36{ 36{
37 gk20a_dbg_fn(""); 37 struct gk20a *g = gk20a_from_as(as);
38
39 nvgpu_log_fn(g, " ");
38 return ++as->last_share_id; 40 return ++as->last_share_id;
39} 41}
40/* still dumb */ 42/* still dumb */
41static void release_as_share_id(struct gk20a_as *as, int id) 43static void release_as_share_id(struct gk20a_as *as, int id)
42{ 44{
43 gk20a_dbg_fn(""); 45 struct gk20a *g = gk20a_from_as(as);
46
47 nvgpu_log_fn(g, " ");
44 return; 48 return;
45} 49}
46 50
@@ -56,7 +60,7 @@ static int gk20a_vm_alloc_share(struct gk20a_as_share *as_share,
56 const bool userspace_managed = 60 const bool userspace_managed =
57 (flags & NVGPU_GPU_IOCTL_ALLOC_AS_FLAGS_USERSPACE_MANAGED) != 0; 61 (flags & NVGPU_GPU_IOCTL_ALLOC_AS_FLAGS_USERSPACE_MANAGED) != 0;
58 62
59 gk20a_dbg_fn(""); 63 nvgpu_log_fn(g, " ");
60 64
61 if (big_page_size == 0) { 65 if (big_page_size == 0) {
62 big_page_size = g->ops.mm.get_default_big_page_size(); 66 big_page_size = g->ops.mm.get_default_big_page_size();
@@ -92,7 +96,7 @@ int gk20a_as_alloc_share(struct gk20a *g,
92 struct gk20a_as_share *as_share; 96 struct gk20a_as_share *as_share;
93 int err = 0; 97 int err = 0;
94 98
95 gk20a_dbg_fn(""); 99 nvgpu_log_fn(g, " ");
96 g = gk20a_get(g); 100 g = gk20a_get(g);
97 if (!g) 101 if (!g)
98 return -ENODEV; 102 return -ENODEV;
@@ -126,8 +130,9 @@ failed:
126int gk20a_vm_release_share(struct gk20a_as_share *as_share) 130int gk20a_vm_release_share(struct gk20a_as_share *as_share)
127{ 131{
128 struct vm_gk20a *vm = as_share->vm; 132 struct vm_gk20a *vm = as_share->vm;
133 struct gk20a *g = gk20a_from_vm(vm);
129 134
130 gk20a_dbg_fn(""); 135 nvgpu_log_fn(g, " ");
131 136
132 vm->as_share = NULL; 137 vm->as_share = NULL;
133 as_share->vm = NULL; 138 as_share->vm = NULL;
@@ -146,7 +151,7 @@ int gk20a_as_release_share(struct gk20a_as_share *as_share)
146 struct gk20a *g = as_share->vm->mm->g; 151 struct gk20a *g = as_share->vm->mm->g;
147 int err; 152 int err;
148 153
149 gk20a_dbg_fn(""); 154 nvgpu_log_fn(g, " ");
150 155
151 err = gk20a_busy(g); 156 err = gk20a_busy(g);
152 157