Module: Mesa Branch: main Commit: c1f8bc67e29e9b05d60e1354fa04927fce5f396b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c1f8bc67e29e9b05d60e1354fa04927fce5f396b
Author: Lucas Stach <[email protected]> Date: Tue Dec 21 21:58:07 2021 +0100 etnaviv: initialize vertex attributes on context reset It seems that at least some GC400 come out of reset with random vertex attributes enabled and also don't disable them on the write to the first config register as normal. Enabling all attributes seems to provide the GPU with the required edge to actually disable the unused attributes on the next draw. Cc: mesa-stable Reported-by: Steven Walter Signed-off-by: Lucas Stach <[email protected]> Reviewed-by: Christian Gmeiner <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14285> --- src/gallium/drivers/etnaviv/etnaviv_context.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/gallium/drivers/etnaviv/etnaviv_context.c b/src/gallium/drivers/etnaviv/etnaviv_context.c index f2ab4ecfe14..6b1327676d7 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_context.c +++ b/src/gallium/drivers/etnaviv/etnaviv_context.c @@ -407,6 +407,7 @@ etna_reset_gpu_state(struct etna_context *ctx) { struct etna_cmd_stream *stream = ctx->stream; struct etna_screen *screen = ctx->screen; + uint32_t dummy_attribs[VIVS_NFE_GENERIC_ATTRIB__LEN] = { 0 }; etna_set_state(stream, VIVS_GL_API_MODE, VIVS_GL_API_MODE_OPENGL); etna_set_state(stream, VIVS_GL_VERTEX_ELEMENT_CONFIG, 0x00000001); @@ -467,6 +468,20 @@ etna_reset_gpu_state(struct etna_context *ctx) VIVS_VS_ICACHE_INVALIDATE_UNK4); } + /* It seems that some GPUs (at least some GC400 have shown this behavior) + * come out of reset with random vertex attributes enabled and also don't + * disable them on the write to the first config register as normal. Enabling + * all attributes seems to provide the GPU with the required edge to actually + * disable the unused attributes on the next draw. + */ + if (screen->specs.halti >= 5) { + etna_set_state_multi(stream, VIVS_NFE_GENERIC_ATTRIB_CONFIG0(0), + VIVS_NFE_GENERIC_ATTRIB__LEN, dummy_attribs); + } else { + etna_set_state_multi(stream, VIVS_FE_VERTEX_ELEMENT_CONFIG(0), + screen->specs.halti >= 0 ? 16 : 12, dummy_attribs); + } + ctx->dirty = ~0L; ctx->dirty_sampler_views = ~0L; }
