Mesa (master): iris/resource: Use isl surface alignment during bo allocation

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 22859a18d5c802cf2d486ecff4eb32e3bf88786d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=22859a18d5c802cf2d486ecff4eb32e3bf88786d

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Fri May 31 15:50:53 2019 -0700

iris/resource: Use isl surface alignment during bo allocation

Reworks:
 * Change subject from "iris: Align main surface allocation to 64k on gen12+"
 * Make use of isl surf alignment. (Nanley)

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/gallium/drivers/iris/iris_resource.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c
index eac329d9ba7..5e532e80100 100644
--- a/src/gallium/drivers/iris/iris_resource.c
+++ b/src/gallium/drivers/iris/iris_resource.c
@@ -823,7 +823,9 @@ iris_resource_create_with_modifiers(struct pipe_screen *pscreen,
       bo_size = res->surf.size_B;
    }
 
-   res->bo = iris_bo_alloc_tiled(screen->bufmgr, name, bo_size, 4096, memzone,
+   uint32_t alignment = MAX2(4096, res->surf.alignment_B);
+   res->bo = iris_bo_alloc_tiled(screen->bufmgr, name, bo_size, alignment,
+                                 memzone,
                                  isl_tiling_to_i915_tiling(res->surf.tiling),
                                  res->surf.row_pitch_B, flags);