From f9442e46ff61c37358d5dc3fa49c6e4f474b4674 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 23 Jul 2021 11:44:35 -0400 Subject: [PATCH] pan/mdg: Garbage collect silly quirk As discussed with Jason and Connor, this is probably subtly broken on Mali T720. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Connor Abbott Part-of: --- src/panfrost/midgard/midgard_compile.c | 3 --- src/panfrost/midgard/midgard_quirks.h | 11 +++-------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index e9729eca55b..a8dc872d31b 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -309,10 +309,7 @@ optimise_nir(nir_shader *nir, unsigned quirks, bool is_blend) nir_lower_tex_options lower_tex_options = { .lower_txs_lod = true, .lower_txp = ~0, - .lower_tex_without_implicit_lod = - (quirks & MIDGARD_EXPLICIT_LOD), .lower_tg4_broadcom_swizzle = true, - /* TODO: we have native gradient.. */ .lower_txd = true, }; diff --git a/src/panfrost/midgard/midgard_quirks.h b/src/panfrost/midgard/midgard_quirks.h index d90d59f7677..70d46f49804 100644 --- a/src/panfrost/midgard/midgard_quirks.h +++ b/src/panfrost/midgard/midgard_quirks.h @@ -28,11 +28,7 @@ * may be errata requiring a workaround, or features. We're trying to be * quirk-positive here; quirky is the best! */ -/* Whether an explicit LOD is required via textureLod in a vertex shader. If - * set, vertex texturing will *always* textureLod. If unset, normal texture ops - * may be emitted in a vertex shader */ - -#define MIDGARD_EXPLICIT_LOD (1 << 0) +/* bit 0 unused */ /* Whether output texture registers (normally r28/r29) overlap with work * registers r0/r1 and input texture registers (also normally r28/r29) overlap @@ -90,12 +86,11 @@ midgard_get_quirks(unsigned gpu_id) return MIDGARD_INTERPIPE_REG_ALIASING; case 0x750: - return MIDGARD_EXPLICIT_LOD | - MIDGARD_NO_UPPER_ALU; + return MIDGARD_NO_UPPER_ALU; case 0x860: case 0x880: - return MIDGARD_EXPLICIT_LOD; + return 0; default: unreachable("Invalid Midgard GPU ID");