Mesa (master): intel/blorp: Fix rectangle size for level-not-zero resolves

[Topi Pohjolainen]

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

Author: Topi Pohjolainen <topi.pohjolainen at intel.com>
Date:   Tue Nov 22 12:15:07 2016 +0200

intel/blorp: Fix rectangle size for level-not-zero resolves

Needed to prevent gpu hangs when mip-mapped compression gets
enabled.

Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

 src/intel/blorp/blorp_clear.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/intel/blorp/blorp_clear.c b/src/intel/blorp/blorp_clear.c
index 83ec57e..d090408 100644
--- a/src/intel/blorp/blorp_clear.c
+++ b/src/intel/blorp/blorp_clear.c
@@ -581,8 +581,8 @@ blorp_ccs_resolve(struct blorp_batch *batch,
       y_scaledown = aux_fmtl->bh / 2;
    }
    params.x0 = params.y0 = 0;
-   params.x1 = params.dst.aux_surf.logical_level0_px.width;
-   params.y1 = params.dst.aux_surf.logical_level0_px.height;
+   params.x1 = minify(params.dst.aux_surf.logical_level0_px.width, level);
+   params.y1 = minify(params.dst.aux_surf.logical_level0_px.height, level);
    params.x1 = ALIGN(params.x1, x_scaledown) / x_scaledown;
    params.y1 = ALIGN(params.y1, y_scaledown) / y_scaledown;