2 files changed, 8 insertions, 19 deletions

diff --git a/drivers/gpu/nvgpu/include/nvgpu/comptags.h b/drivers/gpu/nvgpu/include/nvgpu/comptags.h
index 5482d0ce..2d9f034a 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/comptags.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/comptags.h
@@ -25,8 +25,14 @@ struct nvgpu_os_buffer;
 struct gk20a_comptags {
         u32 offset;
         u32 lines;
-        u32 allocated_lines;
-        bool user_mappable;
+
+        /*
+         * This signals whether allocation has been attempted. Observe
+         * 'lines' to see whether comptags were actually allocated. We
+         * try alloc only once per buffer in order not to break
+         * multiple compressible-kind mappings.
+         */
+        bool allocated;
 };
 
 struct gk20a_comptag_allocator {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/vm.h b/drivers/gpu/nvgpu/include/nvgpu/vm.h
index abb297ab..c0a4124c 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/vm.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/vm.h
@@ -110,9 +110,6 @@ struct nvgpu_mapped_buf {
         u64 size;
 
         u32 pgsz_idx;
-        u32 ctag_offset;
-        u32 ctag_lines;
-        u32 ctag_allocated_lines;
 
         u32 flags;
         u32 kind;
@@ -143,17 +140,6 @@ mapped_buffer_from_rbtree_node(struct nvgpu_rbtree_node *node)
                   ((uintptr_t)node - offsetof(struct nvgpu_mapped_buf, node));
 }
 
-struct nvgpu_ctag_buffer_info {
-        u64                     size;
-        enum gmmu_pgsz_gk20a    pgsz_idx;
-        u32                     flags;
-
-        s16                     compr_kind;
-        s16                     incompr_kind;
-
-        u32                     ctag_lines;
-};
-
 struct vm_gk20a {
         struct mm_gk20a *mm;
         struct gk20a_as_share *as_share; /* as_share this represents */
@@ -221,9 +207,6 @@ void nvgpu_vm_put(struct vm_gk20a *vm);
 int vm_aspace_id(struct vm_gk20a *vm);
 int nvgpu_big_pages_possible(struct vm_gk20a *vm, u64 base, u64 size);
 
-int nvgpu_vm_compute_compression(struct vm_gk20a *vm,
-                                 struct nvgpu_ctag_buffer_info *binfo);
-
 /* batching eliminates redundant cache flushes and invalidates */
 void nvgpu_vm_mapping_batch_start(struct vm_gk20a_mapping_batch *batch);
 void nvgpu_vm_mapping_batch_finish(