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

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Dec 28 16:42:53 2017 -0800

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.

---

 src/gallium/drivers/vc5/vc5_resource.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/vc5/vc5_resource.c b/src/gallium/drivers/vc5/vc5_resource.c
index ddf4d5d377..0e4aaa1924 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);