gpu: nvgpu: Remove bools from nvgpu_mem

Replace a couple of boolean fields in nvgpu_mem with bits in a
bitmap introduced in an earlier patch.

JIRA NVGPU-12
JIRA NVGPU-30

Change-Id: Iffc31bd629cab9a37e5a4fd13377eb9090353410
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1464079
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>

1 files changed, 15 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h
index 397e9ab1..b01fbec5 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h
@@ -53,6 +53,21 @@ struct nvgpu_mem {
          * the struct is just a copy of another nvgpu_mem struct.
          */
 #define NVGPU_MEM_FLAG_SHADOW_COPY               (1 << 0)
+
+        /*
+         * Specify that the GVA mapping is a fixed mapping - that is the caller
+         * chose the GPU VA, not the GMMU mapping function. Only relevant for
+         * VIDMEM.
+         */
+#define NVGPU_MEM_FLAG_FIXED                     (1 << 1)
+
+        /*
+         * Set for user generated VIDMEM allocations. This triggers a special
+         * cleanup path that clears the vidmem on free. Given that the VIDMEM is
+         * zeroed on boot this means that all user vidmem allocations are
+         * therefor zeroed (to prevent leaking information in VIDMEM buffers).
+         */
+#define NVGPU_MEM_FLAG_USER_MEM                  (1 << 2)
         unsigned long                            mem_flags;
 
         /*
@@ -63,8 +78,6 @@ struct nvgpu_mem {
         /*
          * Fields only populated for vidmem allocations.
          */
-        bool                                     fixed;
-        bool                                     user_mem;
         struct nvgpu_allocator                  *allocator;
         struct nvgpu_list_node                   clear_list_entry;