commit 6fe54cca81bf7febdf2f820253b3e6ceab3bff2a
author Craig Stout <cstout@google.com> Thu Jun 08 10:56:42 2017 -0700
committer Craig Stout <cstout@google.com> Thu Jun 08 11:17:27 2017 -0700
tree c2375e058bac5c969ac8b3ca4c08bd4b87fd7b82
parent f994e8deb4bc454a16ee3d0ec26d7bf428fa8ea2

Ensure height of 4 to prevent overfetch in vkCmdCopyBuffer

MA-257 #done

Change-Id: Ic7856b5a8ea203677104401ab22926508a0308d7

src/intel/vulkan/anv_blorp.c

diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c
index 7074603..42cf643 100644
--- a/src/intel/vulkan/anv_blorp.c
+++ b/src/intel/vulkan/anv_blorp.c
@@ -591,6 +591,8 @@
 
       /* First, we make a bunch of max-sized copies */
       uint64_t max_copy_size = MAX_SURFACE_DIM * MAX_SURFACE_DIM * bs;
+      /* Ensure height is a multiple of 4 */
+      assert(MAX_SURFACE_DIM % 4 == 0);
       while (copy_size >= max_copy_size) {
          do_buffer_copy(&batch, src_buffer->bo, src_offset,
                         dst_buffer->bo, dst_offset,
@@ -602,6 +604,8 @@
 
       /* Now make a max-width copy */
       uint64_t height = copy_size / (MAX_SURFACE_DIM * bs);
+      /* Ensure height is a multiple of 4 */
+      height = height & ~0x3;
       assert(height < MAX_SURFACE_DIM);
       if (height != 0) {
          uint64_t rect_copy_size = height * MAX_SURFACE_DIM * bs;
@@ -615,9 +619,13 @@
 
       /* Finally, make a small copy to finish it off */
       if (copy_size != 0) {
+         assert(copy_size % 4 == 0);
+         uint64_t width = copy_size / 4;
+         assert(width <= MAX_SURFACE_DIM);
+         bs = gcd_pow2_u64(bs, width);
          do_buffer_copy(&batch, src_buffer->bo, src_offset,
                         dst_buffer->bo, dst_offset,
-                        copy_size / bs, 1, bs);
+                        width / bs, 4, bs);
       }
    }