etnaviv: fix TS samplers on GC7000L
authorJonathan Marek <jonathan@marek.ca>
Mon, 2 Sep 2019 20:23:21 +0000 (16:23 -0400)
committerLucas Stach <l.stach@pengutronix.de>
Fri, 18 Oct 2019 17:23:59 +0000 (19:23 +0200)
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
src/gallium/drivers/etnaviv/etnaviv_texture_desc.c

index f4f059a3c5df26876eaf89c97a30798268501fe5..05b6de44f91dc32c4f9536fcee64a2fe6765e191 100644 (file)
@@ -245,7 +245,8 @@ etna_emit_texture_desc(struct etna_context *ctx)
             struct etna_sampler_view_desc *sv = etna_sampler_view_desc(ctx->sampler_view[x]);
             etna_set_state(stream, VIVS_NTE_DESCRIPTOR_TX_CTRL(x),
                COND(sv->ts.enable, VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_ENABLE) |
-               VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_MODE(sv->ts.mode));
+               VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_MODE(sv->ts.mode) |
+               VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_INDEX(x));
             etna_set_state(stream, VIVS_NTE_DESCRIPTOR_SAMP_CTRL0(x), ss->SAMP_CTRL0 | sv->SAMP_CTRL0);
             etna_set_state(stream, VIVS_NTE_DESCRIPTOR_SAMP_CTRL1(x), ss->SAMP_CTRL1 | sv->SAMP_CTRL1);
             etna_set_state(stream, VIVS_NTE_DESCRIPTOR_SAMP_LOD_MINMAX(x), ss->SAMP_LOD_MINMAX);