Skip to content

Commit 54615ed

Browse files
committed
drm/msm/adreno: Update generated headers
This updates the GPU headers to latest from mesa, using gen_header.py (which is used to generate headers at bulid time for mesa), rather than headergen2 (which doesn't have proper support for A6XX vs A7XX register variants). Mostly just uninteresting churn, but there are a couple spots in a7xx paths which update REG_A6XX_foo to REG_A7XX_foo for registers which are a7xx specific. Cc: Connor Abbott <cwabbott0@gmail.com> Signed-off-by: Rob Clark <robdclark@chromium.org> Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/574880/
1 parent a716527 commit 54615ed

9 files changed

Lines changed: 5598 additions & 1747 deletions

File tree

drivers/gpu/drm/msm/adreno/a2xx.xml.h

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,20 @@
33

44
/* Autogenerated file, DO NOT EDIT manually!
55
6-
This file was generated by the rules-ng-ng headergen tool in this git repository:
7-
http://github.com/freedreno/envytools/
8-
git clone https://github.com/freedreno/envytools.git
6+
This file was generated by the rules-ng-ng gen_header.py tool in this git repository:
7+
http://gitlab.freedesktop.org/mesa/mesa/
8+
git clone https://gitlab.freedesktop.org/mesa/mesa.git
99
1010
The rules-ng-ng source files this header was generated from are:
11-
- /home/robclark/src/mesa/mesa/src/freedreno/registers/adreno.xml ( 594 bytes, from 2023-03-10 18:32:52)
12-
- /home/robclark/src/mesa/mesa/src/freedreno/registers/freedreno_copyright.xml ( 1572 bytes, from 2022-07-23 20:21:46)
13-
- /home/robclark/src/mesa/mesa/src/freedreno/registers/adreno/a2xx.xml ( 91929 bytes, from 2023-02-28 23:52:27)
14-
- /home/robclark/src/mesa/mesa/src/freedreno/registers/adreno/adreno_common.xml ( 15434 bytes, from 2023-03-10 18:32:53)
15-
- /home/robclark/src/mesa/mesa/src/freedreno/registers/adreno/adreno_pm4.xml ( 74995 bytes, from 2023-03-20 18:06:23)
16-
- /home/robclark/src/mesa/mesa/src/freedreno/registers/adreno/a3xx.xml ( 84231 bytes, from 2022-08-02 16:38:43)
17-
- /home/robclark/src/mesa/mesa/src/freedreno/registers/adreno/a4xx.xml ( 113474 bytes, from 2022-08-02 16:38:43)
18-
- /home/robclark/src/mesa/mesa/src/freedreno/registers/adreno/a5xx.xml ( 149590 bytes, from 2023-02-14 19:37:12)
19-
- /home/robclark/src/mesa/mesa/src/freedreno/registers/adreno/a6xx.xml ( 198949 bytes, from 2023-03-20 18:06:23)
20-
- /home/robclark/src/mesa/mesa/src/freedreno/registers/adreno/a6xx_gmu.xml ( 11404 bytes, from 2023-03-10 18:32:53)
21-
- /home/robclark/src/mesa/mesa/src/freedreno/registers/adreno/ocmem.xml ( 1773 bytes, from 2022-08-02 16:38:43)
22-
- /home/robclark/src/mesa/mesa/src/freedreno/registers/adreno/adreno_control_regs.xml ( 9055 bytes, from 2023-03-10 18:32:52)
23-
- /home/robclark/src/mesa/mesa/src/freedreno/registers/adreno/adreno_pipe_regs.xml ( 2976 bytes, from 2023-03-10 18:32:52)
24-
25-
Copyright (C) 2013-2023 by the following authors:
26-
- Rob Clark <robdclark@gmail.com> (robclark)
27-
- Ilia Mirkin <imirkin@alum.mit.edu> (imirkin)
11+
12+
- /home/robclark/src/mesa/mesa/src/freedreno/registers/adreno/a2xx.xml ( 91929 bytes, from Fri Jun 2 14:59:26 2023)
13+
- /home/robclark/src/mesa/mesa/src/freedreno/registers/freedreno_copyright.xml ( 1572 bytes, from Fri Jun 2 14:59:26 2023)
14+
- /home/robclark/src/mesa/mesa/src/freedreno/registers/adreno/adreno_common.xml ( 15434 bytes, from Fri Jun 2 14:59:26 2023)
15+
- /home/robclark/src/mesa/mesa/src/freedreno/registers/adreno/adreno_pm4.xml ( 85691 bytes, from Fri Feb 16 09:49:01 2024)
16+
17+
Copyright (C) 2013-2024 by the following authors:
18+
- Rob Clark <robdclark@gmail.com> Rob Clark
19+
- Ilia Mirkin <imirkin@alum.mit.edu> Ilia Mirkin
2820
2921
Permission is hereby granted, free of charge, to any person obtaining
3022
a copy of this software and associated documentation files (the
@@ -45,8 +37,21 @@ IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
4537
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
4638
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
4739
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
40+
4841
*/
4942

43+
#ifdef __KERNEL__
44+
#include <linux/bug.h>
45+
#define assert(x) BUG_ON(!(x))
46+
#else
47+
#include <assert.h>
48+
#endif
49+
50+
#ifdef __cplusplus
51+
#define __struct_cast(X)
52+
#else
53+
#define __struct_cast(X) (struct X)
54+
#endif
5055

5156
enum a2xx_rb_dither_type {
5257
DITHER_PIXEL = 0,
@@ -1442,16 +1447,18 @@ static inline uint32_t A2XX_MH_ARBITER_CONFIG_IN_FLIGHT_LIMIT(uint32_t val)
14421447
#define A2XX_A220_VSC_BIN_SIZE_WIDTH__SHIFT 0
14431448
static inline uint32_t A2XX_A220_VSC_BIN_SIZE_WIDTH(uint32_t val)
14441449
{
1445-
return ((val >> 5) << A2XX_A220_VSC_BIN_SIZE_WIDTH__SHIFT) & A2XX_A220_VSC_BIN_SIZE_WIDTH__MASK;
1450+
assert(!(val & 0x1f));
1451+
return (((val >> 5)) << A2XX_A220_VSC_BIN_SIZE_WIDTH__SHIFT) & A2XX_A220_VSC_BIN_SIZE_WIDTH__MASK;
14461452
}
14471453
#define A2XX_A220_VSC_BIN_SIZE_HEIGHT__MASK 0x000003e0
14481454
#define A2XX_A220_VSC_BIN_SIZE_HEIGHT__SHIFT 5
14491455
static inline uint32_t A2XX_A220_VSC_BIN_SIZE_HEIGHT(uint32_t val)
14501456
{
1451-
return ((val >> 5) << A2XX_A220_VSC_BIN_SIZE_HEIGHT__SHIFT) & A2XX_A220_VSC_BIN_SIZE_HEIGHT__MASK;
1457+
assert(!(val & 0x1f));
1458+
return (((val >> 5)) << A2XX_A220_VSC_BIN_SIZE_HEIGHT__SHIFT) & A2XX_A220_VSC_BIN_SIZE_HEIGHT__MASK;
14521459
}
14531460

1454-
static inline uint32_t REG_A2XX_VSC_PIPE(uint32_t i0) { return 0x00000c06 + 0x3*i0; }
1461+
#define REG_A2XX_VSC_PIPE(i0) (0x00000c06 + 0x3*(i0))
14551462

14561463
static inline uint32_t REG_A2XX_VSC_PIPE_CONFIG(uint32_t i0) { return 0x00000c06 + 0x3*i0; }
14571464

@@ -1661,7 +1668,8 @@ static inline uint32_t A2XX_RB_COLOR_INFO_SWAP(uint32_t val)
16611668
#define A2XX_RB_COLOR_INFO_BASE__SHIFT 12
16621669
static inline uint32_t A2XX_RB_COLOR_INFO_BASE(uint32_t val)
16631670
{
1664-
return ((val >> 12) << A2XX_RB_COLOR_INFO_BASE__SHIFT) & A2XX_RB_COLOR_INFO_BASE__MASK;
1671+
assert(!(val & 0xfff));
1672+
return (((val >> 12)) << A2XX_RB_COLOR_INFO_BASE__SHIFT) & A2XX_RB_COLOR_INFO_BASE__MASK;
16651673
}
16661674

16671675
#define REG_A2XX_RB_DEPTH_INFO 0x00002002
@@ -1675,7 +1683,8 @@ static inline uint32_t A2XX_RB_DEPTH_INFO_DEPTH_FORMAT(enum adreno_rb_depth_form
16751683
#define A2XX_RB_DEPTH_INFO_DEPTH_BASE__SHIFT 12
16761684
static inline uint32_t A2XX_RB_DEPTH_INFO_DEPTH_BASE(uint32_t val)
16771685
{
1678-
return ((val >> 12) << A2XX_RB_DEPTH_INFO_DEPTH_BASE__SHIFT) & A2XX_RB_DEPTH_INFO_DEPTH_BASE__MASK;
1686+
assert(!(val & 0xfff));
1687+
return (((val >> 12)) << A2XX_RB_DEPTH_INFO_DEPTH_BASE__SHIFT) & A2XX_RB_DEPTH_INFO_DEPTH_BASE__MASK;
16791688
}
16801689

16811690
#define REG_A2XX_A225_RB_COLOR_INFO3 0x00002005
@@ -2654,7 +2663,8 @@ static inline uint32_t A2XX_RB_COPY_CONTROL_CLEAR_MASK(uint32_t val)
26542663
#define A2XX_RB_COPY_DEST_PITCH__SHIFT 0
26552664
static inline uint32_t A2XX_RB_COPY_DEST_PITCH(uint32_t val)
26562665
{
2657-
return ((val >> 5) << A2XX_RB_COPY_DEST_PITCH__SHIFT) & A2XX_RB_COPY_DEST_PITCH__MASK;
2666+
assert(!(val & 0x1f));
2667+
return (((val >> 5)) << A2XX_RB_COPY_DEST_PITCH__SHIFT) & A2XX_RB_COPY_DEST_PITCH__MASK;
26582668
}
26592669

26602670
#define REG_A2XX_RB_COPY_DEST_INFO 0x0000231b
@@ -3027,7 +3037,8 @@ static inline uint32_t A2XX_SQ_TEX_0_CLAMP_Z(enum sq_tex_clamp val)
30273037
#define A2XX_SQ_TEX_0_PITCH__SHIFT 22
30283038
static inline uint32_t A2XX_SQ_TEX_0_PITCH(uint32_t val)
30293039
{
3030-
return ((val >> 5) << A2XX_SQ_TEX_0_PITCH__SHIFT) & A2XX_SQ_TEX_0_PITCH__MASK;
3040+
assert(!(val & 0x1f));
3041+
return (((val >> 5)) << A2XX_SQ_TEX_0_PITCH__SHIFT) & A2XX_SQ_TEX_0_PITCH__MASK;
30313042
}
30323043
#define A2XX_SQ_TEX_0_TILED 0x80000000
30333044

@@ -3061,7 +3072,8 @@ static inline uint32_t A2XX_SQ_TEX_1_CLAMP_POLICY(enum sq_tex_clamp_policy val)
30613072
#define A2XX_SQ_TEX_1_BASE_ADDRESS__SHIFT 12
30623073
static inline uint32_t A2XX_SQ_TEX_1_BASE_ADDRESS(uint32_t val)
30633074
{
3064-
return ((val >> 12) << A2XX_SQ_TEX_1_BASE_ADDRESS__SHIFT) & A2XX_SQ_TEX_1_BASE_ADDRESS__MASK;
3075+
assert(!(val & 0xfff));
3076+
return (((val >> 12)) << A2XX_SQ_TEX_1_BASE_ADDRESS__SHIFT) & A2XX_SQ_TEX_1_BASE_ADDRESS__MASK;
30653077
}
30663078

30673079
#define REG_A2XX_SQ_TEX_2 0x00000002
@@ -3229,8 +3241,11 @@ static inline uint32_t A2XX_SQ_TEX_5_DIMENSION(enum sq_tex_dimension val)
32293241
#define A2XX_SQ_TEX_5_MIP_ADDRESS__SHIFT 12
32303242
static inline uint32_t A2XX_SQ_TEX_5_MIP_ADDRESS(uint32_t val)
32313243
{
3232-
return ((val >> 12) << A2XX_SQ_TEX_5_MIP_ADDRESS__SHIFT) & A2XX_SQ_TEX_5_MIP_ADDRESS__MASK;
3244+
assert(!(val & 0xfff));
3245+
return (((val >> 12)) << A2XX_SQ_TEX_5_MIP_ADDRESS__SHIFT) & A2XX_SQ_TEX_5_MIP_ADDRESS__MASK;
32333246
}
32343247

3248+
#ifdef __cplusplus
3249+
#endif
32353250

32363251
#endif /* A2XX_XML */

0 commit comments

Comments
 (0)