2 files changed, 16 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_as.c b/drivers/gpu/nvgpu/common/linux/ioctl_as.c
index 41bbdfcb..47f612cc 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_as.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_as.c
@@ -32,7 +32,7 @@
 #include "ioctl_as.h"
 #include "os_linux.h"
 
-static u32 gk20a_as_translate_linux_flags(struct gk20a *g, u32 flags)
+static u32 gk20a_as_translate_as_alloc_space_flags(struct gk20a *g, u32 flags)
 {
         u32 core_flags = 0;
 
@@ -80,8 +80,8 @@ static int gk20a_as_ioctl_alloc_space(
         nvgpu_log_fn(g, " ");
         return nvgpu_vm_area_alloc(as_share->vm, args->pages, args->page_size,
                                    &args->o_a.offset,
-                                   gk20a_as_translate_linux_flags(g,
-                                                                  args->flags));
+                                   gk20a_as_translate_as_alloc_space_flags(g,
+                                                                args->flags));
 }
 
 static int gk20a_as_ioctl_free_space(
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
index 7bb97369..e7da0978 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
@@ -55,6 +55,16 @@ struct gk20a_ctrl_priv {
         struct nvgpu_clk_session *clk_session;
 };
 
+static u32 gk20a_as_translate_as_alloc_flags(struct gk20a *g, u32 flags)
+{
+        u32 core_flags = 0;
+
+        if (flags & NVGPU_GPU_IOCTL_ALLOC_AS_FLAGS_USERSPACE_MANAGED)
+                core_flags |= NVGPU_AS_ALLOC_USERSPACE_MANAGED;
+
+        return core_flags;
+}
+
 int gk20a_ctrl_dev_open(struct inode *inode, struct file *filp)
 {
         struct nvgpu_os_linux *l;
@@ -439,7 +449,9 @@ static int gk20a_ctrl_alloc_as(
                 goto clean_up;
         }
 
-        err = gk20a_as_alloc_share(g, args->big_page_size, args->flags,
+        err = gk20a_as_alloc_share(g, args->big_page_size,
+                                   gk20a_as_translate_as_alloc_flags(g,
+                                           args->flags),
                                    &as_share);
         if (err)
                 goto clean_up_file;