Mesa (master): freedreno: Include adreno_pm4.xml.h before adreno_a6xx.xml.h

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c1ba7612fb0b954ced3fdfe498824f058b0cc037
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c1ba7612fb0b954ced3fdfe498824f058b0cc037

Author: Connor Abbott <cwabbott0 at gmail.com>
Date:   Mon Jul  6 13:35:43 2020 +0200

freedreno: Include adreno_pm4.xml.h before adreno_a6xx.xml.h

This matches the XML, and soon adreno_a6xx.xml will start including
types from adreno_pm4.xml.

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

---

 src/freedreno/fdl/fd6_layout_test.c    | 1 +
 src/freedreno/fdl/fd_layout_test.c     | 1 +
 src/freedreno/perfcntrs/fd6_perfcntr.c | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/freedreno/fdl/fd6_layout_test.c b/src/freedreno/fdl/fd6_layout_test.c
index 2a8083a866c..6c917d4bffc 100644
--- a/src/freedreno/fdl/fd6_layout_test.c
+++ b/src/freedreno/fdl/fd6_layout_test.c
@@ -24,6 +24,7 @@
 #include "freedreno_layout.h"
 #include "fd_layout_test.h"
 #include "adreno_common.xml.h"
+#include "adreno_pm4.xml.h"
 #include "a6xx.xml.h"
 
 #include <stdio.h>
diff --git a/src/freedreno/fdl/fd_layout_test.c b/src/freedreno/fdl/fd_layout_test.c
index 03174e58688..99d17e52cc6 100644
--- a/src/freedreno/fdl/fd_layout_test.c
+++ b/src/freedreno/fdl/fd_layout_test.c
@@ -24,6 +24,7 @@
 #include "freedreno_layout.h"
 #include "fd_layout_test.h"
 #include "adreno_common.xml.h"
+#include "adreno_pm4.xml.h"
 #include "a6xx.xml.h"
 
 #include <stdio.h>
diff --git a/src/freedreno/perfcntrs/fd6_perfcntr.c b/src/freedreno/perfcntrs/fd6_perfcntr.c
index fa5ee1232b4..02e55f8babd 100644
--- a/src/freedreno/perfcntrs/fd6_perfcntr.c
+++ b/src/freedreno/perfcntrs/fd6_perfcntr.c
@@ -29,6 +29,7 @@
 
 #include "util/u_half.h"
 #include "adreno_common.xml.h"
+#include "adreno_pm4.xml.h"
 #include "a6xx.xml.h"
 
 #define REG(_x) REG_A6XX_ ## _x