From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Mon, 12 Jun 2017 16:44:20 +0000 (-0700)
Subject: i965/miptree: Use the new simple alloc_tiled for CCS buffers
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1d132712fef5f4acbd022e8468893f5cb941b908;p=mesa.git

i965/miptree: Use the new simple alloc_tiled for CCS buffers

Reviewed-by: Plamena Manolova <plamena.manolova@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index 23ff1a53cbc..02e74caa813 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -1595,13 +1595,8 @@ intel_miptree_alloc_non_msrt_mcs(struct brw_context *brw,
    const uint32_t alloc_flags =
       is_lossless_compressed ? 0 : BO_ALLOC_FOR_RENDER;
 
-   /* ISL has stricter set of alignment rules then the drm allocator.
-    * Therefore one can pass the ISL dimensions in terms of bytes instead of
-    * trying to recalculate based on different format block sizes.
-    */
-   buf->bo = brw_bo_alloc_tiled_2d(brw->bufmgr, "ccs-miptree",
-                                   buf->pitch, buf->size / buf->pitch,
-                                   1, I915_TILING_Y, &buf->pitch, alloc_flags);
+   buf->bo = brw_bo_alloc_tiled(brw->bufmgr, "ccs-miptree", buf->size,
+                                I915_TILING_Y, buf->pitch, alloc_flags);
    if (!buf->bo) {
       free(buf);
       free(aux_state);