Mesa (staging/20.2): freedreno/registers: add some missing regs to build

[GitLab Mirror]

Module: Mesa
Branch: staging/20.2
Commit: a6ccd24636b4acf167b055a94b8ae1167ec28c5f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a6ccd24636b4acf167b055a94b8ae1167ec28c5f

Author: Rob Clark <robdclark at chromium.org>
Date:   Fri Aug  7 16:04:22 2020 -0700

freedreno/registers: add some missing regs to build

Needed for installed version of crashdec/cffdump.

Fixes: 9c33c538981 ("freedreno/registers: install gzip'd register database")
Signed-off-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6234>
(cherry picked from commit 3b6e8670f8128522ecf366b3121051ca32219fc8)

---

 .pick_status.json                          | 2 +-
 src/freedreno/registers/adreno/meson.build | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index b504ff921c7..6aa7edf3c27 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -517,7 +517,7 @@
         "description": "freedreno/registers: add some missing regs to build",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "9c33c5389818bc5035eb4538ea5d3fc1321dd27e"
     },
diff --git a/src/freedreno/registers/adreno/meson.build b/src/freedreno/registers/adreno/meson.build
index f43e55d5656..565648c9546 100644
--- a/src/freedreno/registers/adreno/meson.build
+++ b/src/freedreno/registers/adreno/meson.build
@@ -24,6 +24,10 @@ xml_files = [
   'a4xx.xml',
   'a5xx.xml',
   'a6xx.xml',
+  'a6xx_gmu.xml',
+  'ocmem.xml',
+  'adreno_control_regs.xml',
+  'adreno_pipe_regs.xml',
   'adreno_common.xml',
   'adreno_pm4.xml',
 ]