From: Connor Abbott <cwabbott0@gmail.com>
Date: Fri, 31 Jul 2020 10:11:16 +0000 (+0200)
Subject: freedreno/afuc: Add missing rnn_prepdb()
X-Git-Tag: upstream/21.0.0~6923
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5daaed587caba51cd485791d75a2aaa30409b9f;p=platform%2Fupstream%2Fmesa.git

freedreno/afuc: Add missing rnn_prepdb()

It's totally not obvious, but this runs extra error checking and is
necessary for correct variant handling, and variant handling will
silently not work if it's not enabled. Add it asm.c even though it's not
strictly necessary, to prevent anyone from missing this in the future.

Missing this really should be an error.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6140>
---

diff --git a/src/freedreno/afuc/asm.c b/src/freedreno/afuc/asm.c
index 5b19c7f..56036be 100644
--- a/src/freedreno/afuc/asm.c
+++ b/src/freedreno/afuc/asm.c
@@ -417,6 +417,7 @@ int main(int argc, char **argv)
 	ctx = rnndec_newcontext(db);
 
 	rnn_parsefile(db, "adreno.xml");
+	rnn_prepdb(db);
 	if (db->estatus)
 		errx(db->estatus, "failed to parse register database");
 	dom[0] = rnn_finddomain(db, name);
diff --git a/src/freedreno/afuc/disasm.c b/src/freedreno/afuc/disasm.c
index 66e40c1..2a25710 100644
--- a/src/freedreno/afuc/disasm.c
+++ b/src/freedreno/afuc/disasm.c
@@ -816,6 +816,7 @@ int main(int argc, char **argv)
 	ctx->colors = colors ? &envy_def_colors : &envy_null_colors;
 
 	rnn_parsefile(db, "adreno.xml");
+	rnn_prepdb(db);
 	if (db->estatus)
 		errx(db->estatus, "failed to parse register database");
 	dom[0] = rnn_finddomain(db, variant);