From: Eric Anholt <eric@anholt.net>
Date: Fri, 29 Dec 2017 00:42:53 +0000 (-0800)
Subject: broadcom/vc5: Fix image_h value for CPU-side tiling on miplevels > 1.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=44237b3f85fb8547e29ec8d090a3a72ce095e2a2;p=mesa.git

broadcom/vc5: Fix image_h value for CPU-side tiling on miplevels > 1.

Fixes overflow that caused failure in
dEQP-GLES3.functional.texture.filtering.2d.sizes.128x128_linear.
---

diff --git a/src/gallium/drivers/vc5/vc5_resource.c b/src/gallium/drivers/vc5/vc5_resource.c
index ddf4d5d377a..0e4aaa19246 100644
--- a/src/gallium/drivers/vc5/vc5_resource.c
+++ b/src/gallium/drivers/vc5/vc5_resource.c
@@ -133,7 +133,8 @@ vc5_resource_transfer_unmap(struct pipe_context *pctx,
                                               slice->stride,
                                               trans->map, ptrans->stride,
                                               slice->tiling, rsc->cpp,
-                                              rsc->base.height0,
+                                              u_minify(rsc->base.height0,
+                                                       ptrans->level),
                                               &ptrans->box);
                 }
                 free(trans->map);