freedreno/a6xx: Add single common source for a6xx.xml.h

In the following commits, as we split up a6xx.xml, the #include sequence gets a bit more complicated. Let's keep it in one place. Signed-off-by: Rob Clark <rob.clark@oss.qualcomm.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35899>
2025-07-02 14:27:33 -07:00
parent 0be21c91f4
commit 4b89184e9a
15 changed files with 30 additions and 40 deletions
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its susidiaries.
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifndef FD6_HW_H
+#define FD6_HW_H
+
+#include "adreno_pm4.xml.h"
+#include "adreno_common.xml.h"
+
+#include "a6xx.xml.h"
+
+#endif /* FD6_HW_H */
@@ -6,7 +6,7 @@
 #ifndef FD6_PACK_H
 #define FD6_PACK_H

-#include "a6xx.xml.h"
+#include "fd6_hw.h"

 struct fd_reg_pair {
   uint32_t reg;
@@ -8,7 +8,7 @@

 #include <stdint.h>

-#include "a6xx.xml.h"
+#include "fd6_hw.h"

 /* In order to debug issues with usage of stale reg data we need to have
 * a list of regs which we allowed to stomp.
@@ -25,9 +25,7 @@

 #include "util/u_math.h"

-#include "adreno_pm4.xml.h"
-#include "adreno_common.xml.h"
-#include "a6xx.xml.h"
+#include "fd6_hw.h"

 #include "common/freedreno_dev_info.h"

@@ -16,11 +16,7 @@

 #include "util/u_math.h"

-#include "adreno_common.xml.h"
-#include "adreno_pm4.xml.h"
-#include "freedreno_pm4.h"
-
-#include "a6xx.xml.h"
+#include "fd6_hw.h"

 #include "ir3/ir3_assembler.h"
 #include "ir3/ir3_compiler.h"
@@ -24,11 +24,7 @@

 #include "util/u_math.h"

-#include "adreno_common.xml.h"
-#include "adreno_pm4.xml.h"
-#include "freedreno_pm4.h"
-
-#include "a6xx.xml.h"
+#include "fd6_hw.h"
 #include "common/freedreno_dev_info.h"

 #include "util/hash_table.h"
@@ -15,9 +15,7 @@

 #include "common/freedreno_common.h"

-#include "adreno_pm4.xml.h"
-#include "adreno_common.xml.h"
-#include "a6xx.xml.h"
+#include "fd6_hw.h"

 BEGINC;

@@ -11,9 +11,7 @@

 #include "freedreno_layout.h"

-#include "adreno_pm4.xml.h"
-#include "adreno_common.xml.h"
-#include "a6xx.xml.h"
+#include "fd6_hw.h"

 static bool
 is_r8g8(const struct fdl_layout *layout)
@@ -5,11 +5,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>
+#include "fd6_hw.h"

 static const struct testcase
   testcases_a630[] =
@@ -5,9 +5,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 "fd6_hw.h"

 #include <stdio.h>

@@ -11,9 +11,8 @@

 #include "util/half_float.h"
 #include "util/u_math.h"
-#include "adreno_common.xml.h"
-#include "adreno_pm4.xml.h"
-#include "a6xx.xml.h"
+
+#include "fd6_hw.h"

 #define REG(_x) REG_A6XX_ ## _x
 #include "freedreno_perfcntr.h"
@@ -4,9 +4,8 @@
 */

 #include "util/u_math.h"
-#include "adreno_common.xml.h"
-#include "adreno_pm4.xml.h"
-#include "a6xx.xml.h"
+
+#include "fd6_hw.h"

 #include "freedreno_perfcntr.h"

@@ -55,9 +55,7 @@
 #include "ir3/ir3_compiler.h"
 #include "ir3/ir3_shader.h"

-#include "adreno_common.xml.h"
-#include "adreno_pm4.xml.h"
-#include "a6xx.xml.h"
+#include "fd6_hw.h"
 #include "fdl/freedreno_layout.h"
 #include "common/freedreno_dev_info.h"
 #include "common/freedreno_common.h"
@@ -18,7 +18,7 @@
 #include "ir3/ir3_shader.h"
 #include "ir3/ir3_descriptor.h"

-#include "a6xx.xml.h"
+#include "fd6_hw.h"

 struct fd6_lrz_state {
   union {
@@ -17,7 +17,7 @@
 #include "common/freedreno_lrz.h"
 #include "common/freedreno_ubwc.h"

-#include "a6xx.xml.h"
+#include "fd6_hw.h"

 /* A subset of the valid tiled formats can be compressed.  We do
 * already require tiled in order to be compressed, but just because