diff --git a/.pick_status.json b/.pick_status.json index e427eae2e07..f313bd6c0fb 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -490,7 +490,7 @@ "description": "etnaviv: disable linear PE by default", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "43eb5e777e4b64fe1b143822ae8aaf709eaad42f" }, diff --git a/src/gallium/drivers/etnaviv/etnaviv_debug.h b/src/gallium/drivers/etnaviv/etnaviv_debug.h index cb816a847e5..45e4988572d 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_debug.h +++ b/src/gallium/drivers/etnaviv/etnaviv_debug.h @@ -54,7 +54,7 @@ #define ETNA_DBG_NO_SINGLEBUF 0x400000 /* disable single buffer feature */ #define ETNA_DBG_DEQP 0x800000 /* Hacks to run dEQP GLES3 tests */ #define ETNA_DBG_NOCACHE 0x1000000 /* Disable shader cache */ -#define ETNA_DBG_NO_LINEAR_PE 0x2000000 /* Disable linear PE */ +#define ETNA_DBG_LINEAR_PE 0x2000000 /* Enable linear PE */ #define ETNA_DBG_MSAA 0x4000000 /* Enable MSAA */ extern int etna_mesa_debug; /* set in etnaviv_screen.c from ETNA_MESA_DEBUG */ diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c index d9ae137cc39..795f1258a4a 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_screen.c +++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c @@ -72,7 +72,7 @@ static const struct debug_named_value etna_debug_options[] = { {"no_singlebuffer",ETNA_DBG_NO_SINGLEBUF, "Disable single buffer feature"}, {"deqp", ETNA_DBG_DEQP, "Hacks to run dEQP GLES3 tests"}, /* needs MESA_GLES_VERSION_OVERRIDE=3.0 */ {"nocache", ETNA_DBG_NOCACHE, "Disable shader cache"}, - {"no_linear_pe", ETNA_DBG_NO_LINEAR_PE, "Disable linear PE"}, + {"linear_pe", ETNA_DBG_LINEAR_PE, "Enable linear PE"}, {"msaa", ETNA_DBG_MSAA, "Enable MSAA support"}, DEBUG_NAMED_VALUE_END }; @@ -1133,7 +1133,7 @@ etna_screen_create(struct etna_device *dev, struct etna_gpu *gpu, screen->specs.can_supertile = 0; if (DBG_ENABLED(ETNA_DBG_NO_SINGLEBUF)) screen->specs.single_buffer = 0; - if (DBG_ENABLED(ETNA_DBG_NO_LINEAR_PE)) + if (!DBG_ENABLED(ETNA_DBG_LINEAR_PE)) screen->features[viv_chipMinorFeatures2] &= ~chipMinorFeatures2_LINEAR_PE; pscreen->destroy = etna_screen_destroy;