summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/include/nvgpu/allocator.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/include/nvgpu/allocator.h')
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/allocator.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/allocator.h b/drivers/gpu/nvgpu/include/nvgpu/allocator.h
index 2bff0efd..d722673d 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/allocator.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/allocator.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2011-2017, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2011-2018, NVIDIA CORPORATION. All rights reserved.
3 * 3 *
4 * Permission is hereby granted, free of charge, to any person obtaining a 4 * Permission is hereby granted, free of charge, to any person obtaining a
5 * copy of this software and associated documentation files (the "Software"), 5 * copy of this software and associated documentation files (the "Software"),
@@ -83,7 +83,7 @@ struct nvgpu_allocator_ops {
83 u64 (*base)(struct nvgpu_allocator *allocator); 83 u64 (*base)(struct nvgpu_allocator *allocator);
84 u64 (*length)(struct nvgpu_allocator *allocator); 84 u64 (*length)(struct nvgpu_allocator *allocator);
85 u64 (*end)(struct nvgpu_allocator *allocator); 85 u64 (*end)(struct nvgpu_allocator *allocator);
86 int (*inited)(struct nvgpu_allocator *allocator); 86 bool (*inited)(struct nvgpu_allocator *allocator);
87 u64 (*space)(struct nvgpu_allocator *allocator); 87 u64 (*space)(struct nvgpu_allocator *allocator);
88 88
89 /* Destructor. */ 89 /* Destructor. */
@@ -188,11 +188,11 @@ nvgpu_alloc_carveout_from_co_entry(struct nvgpu_list_node *node)
188 * pointing to the allocation base (requires GPU_ALLOC_FORCE_CONTIG to be 188 * pointing to the allocation base (requires GPU_ALLOC_FORCE_CONTIG to be
189 * set as well). 189 * set as well).
190 */ 190 */
191#define GPU_ALLOC_GVA_SPACE BIT(0) 191#define GPU_ALLOC_GVA_SPACE BIT64(0)
192#define GPU_ALLOC_NO_ALLOC_PAGE BIT(1) 192#define GPU_ALLOC_NO_ALLOC_PAGE BIT64(1)
193#define GPU_ALLOC_4K_VIDMEM_PAGES BIT(2) 193#define GPU_ALLOC_4K_VIDMEM_PAGES BIT64(2)
194#define GPU_ALLOC_FORCE_CONTIG BIT(3) 194#define GPU_ALLOC_FORCE_CONTIG BIT64(3)
195#define GPU_ALLOC_NO_SCATTER_GATHER BIT(4) 195#define GPU_ALLOC_NO_SCATTER_GATHER BIT64(4)
196 196
197static inline void alloc_lock(struct nvgpu_allocator *a) 197static inline void alloc_lock(struct nvgpu_allocator *a)
198{ 198{
@@ -256,7 +256,7 @@ void nvgpu_alloc_release_carveout(struct nvgpu_allocator *a,
256u64 nvgpu_alloc_base(struct nvgpu_allocator *a); 256u64 nvgpu_alloc_base(struct nvgpu_allocator *a);
257u64 nvgpu_alloc_length(struct nvgpu_allocator *a); 257u64 nvgpu_alloc_length(struct nvgpu_allocator *a);
258u64 nvgpu_alloc_end(struct nvgpu_allocator *a); 258u64 nvgpu_alloc_end(struct nvgpu_allocator *a);
259u64 nvgpu_alloc_initialized(struct nvgpu_allocator *a); 259bool nvgpu_alloc_initialized(struct nvgpu_allocator *a);
260u64 nvgpu_alloc_space(struct nvgpu_allocator *a); 260u64 nvgpu_alloc_space(struct nvgpu_allocator *a);
261 261
262void nvgpu_alloc_destroy(struct nvgpu_allocator *allocator); 262void nvgpu_alloc_destroy(struct nvgpu_allocator *allocator);