Mesa (master): etnaviv: disable in-place resolve for non-supertiled surfaces

[Christian Gmeiner]

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

Author: Lucas Stach <l.stach at pengutronix.de>
Date:   Tue Dec 19 17:35:59 2017 +0100

etnaviv: disable in-place resolve for non-supertiled surfaces

The in-place resolve probably has some additional restrictions when not
operating on a super tiled surface. Disable it on non-supertiled surfaces
for now to work around a GPU hang.

Fixes: 78ade659569e ("etnaviv: Do GC3000 resolve-in-place when possible")
Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Lucas Stach <l.stach at pengutronix.de>
Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>

---

 src/gallium/drivers/etnaviv/etnaviv_rs.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gallium/drivers/etnaviv/etnaviv_rs.c b/src/gallium/drivers/etnaviv/etnaviv_rs.c
index 3d9d6a0b35..7d9e8e0e38 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_rs.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_rs.c
@@ -143,6 +143,7 @@ etna_compile_rs_state(struct etna_context *ctx, struct compiled_rs_state *cs,
          rs->source_offset == rs->dest_offset &&
          rs->source_format == rs->dest_format &&
          rs->source_tiling == rs->dest_tiling &&
+         (rs->source_tiling & ETNA_LAYOUT_BIT_SUPER) &&
          rs->source_stride == rs->dest_stride &&
          !rs->downsample_x && !rs->downsample_y &&
          !rs->swap_rb && !rs->flip &&