2 files changed, 6 insertions, 27 deletions

diff --git a/drivers/gpu/nvgpu/include/nvgpu/linux/vm.h b/drivers/gpu/nvgpu/include/nvgpu/linux/vm.h
index d810f95f..dee8fa09 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/linux/vm.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/linux/vm.h
@@ -38,25 +38,13 @@ struct vm_gk20a;
 struct vm_gk20a_mapping_batch;
 struct nvgpu_vm_area;
 
+/* NVGPU_AS_MAP_BUFFER_FLAGS_DIRECT_KIND_CTRL must be set */
 int nvgpu_vm_map_linux(struct vm_gk20a *vm,
                        struct dma_buf *dmabuf,
                        u64 offset_align,
                        u32 flags,
-
-                       /*
-                        * compressible kind if
-                        * NVGPU_AS_MAP_BUFFER_FLAGS_DIRECT_KIND_CTRL is
-                        * specified, otherwise just the kind
-                        */
                        s16 compr_kind,
-
-                       /*
-                        * incompressible kind if
-                        * NVGPU_AS_MAP_BUFFER_FLAGS_DIRECT_KIND_CTRL is
-                        * specified, otherwise ignored
-                        */
                        s16 incompr_kind,
-
                        int rw_flag,
                        u64 buffer_offset,
                        u64 mapping_size,
@@ -66,12 +54,7 @@ int nvgpu_vm_map_linux(struct vm_gk20a *vm,
 /*
  * Notes:
  * - Batch may be NULL if map op is not part of a batch.
- * - If NVGPU_AS_MAP_BUFFER_FLAGS_DIRECT_KIND_CTRL is set,
- *   compr_kind and incompr_kind work as explained in nvgpu.h.
- * - If NVGPU_AS_MAP_BUFFER_FLAGS_DIRECT_KIND_CTRL is NOT set,
- *   compr_kind holds the kind and kernel will figure out whether
- *   it is a compressible or incompressible kind. If compressible, kernel will
- *   also figure out the incompressible counterpart or return an error.
+ * - NVGPU_AS_MAP_BUFFER_FLAGS_DIRECT_KIND_CTRL must be set
  */
 int nvgpu_vm_map_buffer(struct vm_gk20a *vm,
                         int dmabuf_fd,
diff --git a/drivers/gpu/nvgpu/include/nvgpu/vm.h b/drivers/gpu/nvgpu/include/nvgpu/vm.h
index 801fb8ed..10a7f7ce 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/vm.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/vm.h
@@ -127,10 +127,8 @@ struct nvgpu_ctag_buffer_info {
         enum gmmu_pgsz_gk20a    pgsz_idx;
         u32                     flags;
 
-        u8                      kind_v;
-        u8                      uc_kind_v;
-        bool                    use_kind_v;
-        bool                    use_uc_kind_v;
+        s16                     compr_kind;
+        s16                     incompr_kind;
 
         u32                     ctag_lines;
 };
@@ -202,10 +200,8 @@ 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_init_kind_info(struct nvgpu_ctag_buffer_info *binfo,
-                            s16 compr_kind, s16 incompr_kind);
-int nvgpu_vm_compute_kind_and_compression(struct vm_gk20a *vm,
-                                          struct nvgpu_ctag_buffer_info *binfo);
+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);