From 295fa01db80f4c65240d3ea90fb0053c23c25191 Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Tue, 16 Apr 2024 08:19:25 +0200 Subject: [PATCH] etnaviv: Fix disabling of features We must disable features before we fill our internal etna_specs struct with etna_get_specs(..). Fixes: d600b45ccc9 ("etnaviv: Switch to etna_core APIs") Signed-off-by: Christian Gmeiner Reviewed-by: Lucas Stach Part-of: --- src/gallium/drivers/etnaviv/etnaviv_screen.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c index 6c935eaff8c..e499d08aeb2 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_screen.c +++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c @@ -1077,13 +1077,6 @@ etna_screen_create(struct etna_device *dev, struct etna_gpu *gpu, goto fail; } - etna_get_specs(screen); - - if (screen->specs.halti >= 5 && !etnaviv_device_softpin_capable(dev)) { - DBG("halti5 requires softpin"); - goto fail; - } - /* apply debug options that disable individual features */ if (DBG_ENABLED(ETNA_DBG_NO_EARLY_Z)) etna_core_disable_feature(screen->info, ETNA_FEATURE_NO_EARLY_Z); @@ -1098,6 +1091,13 @@ etna_screen_create(struct etna_device *dev, struct etna_gpu *gpu, if (!DBG_ENABLED(ETNA_DBG_LINEAR_PE)) etna_core_disable_feature(screen->info, ETNA_FEATURE_LINEAR_PE); + etna_get_specs(screen); + + if (screen->specs.halti >= 5 && !etnaviv_device_softpin_capable(dev)) { + DBG("halti5 requires softpin"); + goto fail; + } + pscreen->destroy = etna_screen_destroy; pscreen->get_screen_fd = etna_screen_get_fd; pscreen->get_param = etna_screen_get_param;