1 From c69f1dba5c2b51614d69580249d52eb62dddaf62 Mon Sep 17 00:00:00 2001
2 From: Eric Engestrom <eric@engestrom.ch>
3 Date: Wed, 10 Aug 2022 16:43:24 +0100
4 Subject: [PATCH] Revert "pan/bi: Require ATEST coverage mask input in R60"
6 This reverts commit 7ead256891cec7a301d2fd415405a7f9106b1f46.
8 See https://gitlab.freedesktop.org/mesa/mesa/-/issues/7025 for the
9 details, but the short version is that this was causing a segfault.
11 .pick_status.json | 2 +-
12 src/panfrost/bifrost/bi_ra.c | 11 -----------
13 2 files changed, 1 insertion(+), 12 deletions(-)
15 diff --git a/.pick_status.json b/.pick_status.json
16 index f33cb9b8538a..2dec29fd3e76 100644
17 --- a/.pick_status.json
18 +++ b/.pick_status.json
20 "description": "pan/bi: Require ATEST coverage mask input in R60",
28 diff --git a/src/panfrost/bifrost/bi_ra.c b/src/panfrost/bifrost/bi_ra.c
29 index 7472c2e550b5..8b14c0ec79a9 100644
30 --- a/src/panfrost/bifrost/bi_ra.c
31 +++ b/src/panfrost/bifrost/bi_ra.c
32 @@ -334,17 +334,6 @@ bi_allocate_registers(bi_context *ctx, bool *success, bool full_regs)
33 if (node < node_count)
34 l->solutions[node] = 4;
37 - /* Experimentally, it seems coverage masks inputs to ATEST must
38 - * be in R60. Otherwise coverage mask writes do not work with
39 - * early-ZS with pixel-frequency-shading (this combination of
40 - * settings is legal if depth/stencil writes are disabled).
42 - if (ins->op == BI_OPCODE_ATEST) {
43 - unsigned node = bi_get_node(ins->src[0]);
44 - assert(node < node_count);
45 - l->solutions[node] = 60;
49 bi_compute_interference(ctx, l, full_regs);