From: Connor Abbott <cwabbott0@gmail.com>
Date: Mon, 6 Jul 2020 11:35:43 +0000 (+0200)
Subject: freedreno: Include adreno_pm4.xml.h before adreno_a6xx.xml.h
X-Git-Tag: upstream/21.0.0~7910
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c1ba7612fb0b954ced3fdfe498824f058b0cc037;p=platform%2Fupstream%2Fmesa.git

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>
---

diff --git a/src/freedreno/fdl/fd6_layout_test.c b/src/freedreno/fdl/fd6_layout_test.c
index 2a8083a..6c917d4 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 03174e5..99d17e5 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 fa5ee12..02e55f8 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