From faa3d901ab3d8aa25f7a30db77b2a8a5c9b0a352 Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Thu, 24 Jul 2025 12:49:56 +0200 Subject: [PATCH] etnaviv: Only emit VIVS_PS_MSAA_CONFIG if GPU support it Context buffer initialization in the nxp-imx kernel driver (lf-6.6.3-1.0.0) indicates that this state is only defined when the GPU supports MSAA_FRAGMENT_OPERATION. Signed-off-by: Christian Gmeiner Reviewed-by: Lucas Stach Part-of: --- src/gallium/drivers/etnaviv/etnaviv_context.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_context.c b/src/gallium/drivers/etnaviv/etnaviv_context.c index 1fa91def951..06339c5996e 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_context.c +++ b/src/gallium/drivers/etnaviv/etnaviv_context.c @@ -499,8 +499,6 @@ etna_reset_gpu_state(struct etna_context *ctx) etna_set_state(stream, VIVS_PS_HALTI3_UNK0103C, 0x76543210); } if (screen->info->halti >= 4) { /* Only on HALTI4+ */ - etna_set_state(stream, VIVS_PS_MSAA_CONFIG, 0x6fffffff & 0xf70fffff & 0xfff6ffff & - 0xffff6fff & 0xfffff6ff & 0xffffff7f); etna_set_state(stream, VIVS_PE_HALTI4_UNK014C0, 0x00000000); } if (screen->info->halti >= 5) { /* Only on HALTI5+ */ @@ -512,6 +510,10 @@ etna_reset_gpu_state(struct etna_context *ctx) etna_set_state(stream, VIVS_SH_CONFIG, VIVS_SH_CONFIG_RTNE_ROUNDING); } + if (VIV_FEATURE(screen, ETNA_FEATURE_MSAA_FRAGMENT_OPERATION)) + etna_set_state(stream, VIVS_PS_MSAA_CONFIG, 0x6fffffff & 0xf70fffff & 0xfff6ffff & + 0xffff6fff & 0xfffff6ff & 0xffffff7f); + if (VIV_FEATURE(screen, ETNA_FEATURE_BUG_FIXES18)) etna_set_state(stream, VIVS_GL_BUG_FIXES, 0x6);