4 files changed, 26 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_hal_gm20b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_hal_gm20b.c
index 0e560981..6f50dbb8 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_hal_gm20b.c
+++ b/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_hal_gm20b.c
@@ -195,6 +195,7 @@ static const struct gpu_ops vgpu_gm20b_ops = {
                         gm20b_fb_set_use_full_comp_tag_line,
                 .compression_page_size = gm20b_fb_compression_page_size,
                 .compressible_page_size = gm20b_fb_compressible_page_size,
+                .compression_align_mask = gm20b_fb_compression_align_mask,
                 .vpr_info_fetch = gm20b_fb_vpr_info_fetch,
                 .dump_vpr_wpr_info = gm20b_fb_dump_vpr_wpr_info,
                 .read_wpr_info = gm20b_fb_read_wpr_info,
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c
index acd0ad5d..7c376396 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c
@@ -223,6 +223,7 @@ static const struct gpu_ops vgpu_gp10b_ops = {
                         gm20b_fb_set_use_full_comp_tag_line,
                 .compression_page_size = gp10b_fb_compression_page_size,
                 .compressible_page_size = gp10b_fb_compressible_page_size,
+                .compression_align_mask = gm20b_fb_compression_align_mask,
                 .vpr_info_fetch = gm20b_fb_vpr_info_fetch,
                 .dump_vpr_wpr_info = gm20b_fb_dump_vpr_wpr_info,
                 .read_wpr_info = gm20b_fb_read_wpr_info,
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c
index a470377c..7d60bfb2 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c
@@ -263,6 +263,7 @@ static const struct gpu_ops vgpu_gv11b_ops = {
                         gm20b_fb_set_use_full_comp_tag_line,
                 .compression_page_size = gp10b_fb_compression_page_size,
                 .compressible_page_size = gp10b_fb_compressible_page_size,
+                .compression_align_mask = gm20b_fb_compression_align_mask,
                 .vpr_info_fetch = gm20b_fb_vpr_info_fetch,
                 .dump_vpr_wpr_info = gm20b_fb_dump_vpr_wpr_info,
                 .read_wpr_info = gm20b_fb_read_wpr_info,
diff --git a/drivers/gpu/nvgpu/common/mm/vm.c b/drivers/gpu/nvgpu/common/mm/vm.c
index 637632e0..f85089d5 100644
--- a/drivers/gpu/nvgpu/common/mm/vm.c
+++ b/drivers/gpu/nvgpu/common/mm/vm.c
@@ -847,6 +847,29 @@ struct nvgpu_mapped_buf *nvgpu_vm_map(struct vm_gk20a *vm,
                 goto clean_up;
         }
 
+        if ((binfo.compr_kind != NVGPU_KIND_INVALID) &&
+            (flags & NVGPU_VM_MAP_FIXED_OFFSET)) {
+                /*
+                 * Fixed-address compressible mapping is
+                 * requested. Make sure we're respecting the alignment
+                 * requirement for virtual addresses and buffer
+                 * offsets.
+                 *
+                 * This check must be done before we may fall back to
+                 * the incompressible kind.
+                 */
+
+                const u64 offset_mask = g->ops.fb.compression_align_mask(g);
+
+                if ((map_addr & offset_mask) != (phys_offset & offset_mask)) {
+                        nvgpu_log(g, gpu_dbg_map,
+                                  "Misaligned compressible-kind fixed-address "
+                                  "mapping");
+                        err = -EINVAL;
+                        goto clean_up;
+                }
+        }
+
         if (binfo.compr_kind != NVGPU_KIND_INVALID) {
                 struct gk20a_comptags comptags = { 0 };