From a142925b7a0908de900dee56aa7c4b84ae7a7e0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 28 Mar 2021 01:03:42 -0400 Subject: [PATCH] amd/registers: fix the kernel header parser with latest headers Reviewed-by: Bas Nieuwenhuizen Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/amd/registers/parse_kernel_headers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/amd/registers/parse_kernel_headers.py b/src/amd/registers/parse_kernel_headers.py index ec8ffa358b8..b50dcef296d 100644 --- a/src/amd/registers/parse_kernel_headers.py +++ b/src/amd/registers/parse_kernel_headers.py @@ -51,11 +51,12 @@ gfx_versions = { } # match: static const struct IP_BASE GC_BASE ={ { { { 0x00001260, 0x0000A000, 0x02402C00, 0, 0 } }, -re_base = re.compile(r'^static const struct IP_BASE GC_BASE\s*=\s*{ { { { (\w+), (\w+), (\w+), (\w+), (\w+) } },\n') +re_base = re.compile(r'^static const struct IP_BASE.*GC_BASE\s*=\s*{ { { { (\w+), (\w+), (\w+), (\w+), (\w+).*} },\n') # match: #define mmSDMA0_DEC_START 0x0000 # match: #define ixSDMA0_DEC_START 0x0000 -re_offset = re.compile(r'^#define (?P[mi][mx])(?P\w+)\s+(?P\w+)\n') +# match: #define regSDMA0_DEC_START 0x0000 +re_offset = re.compile(r'^#define (?P(mm|ix|reg))(?P\w+)\s+(?P\w+)\n') # match: #define SDMA0_DEC_START__START__SHIFT 0x0 re_shift = re.compile(r'^#define (?P\w+)__(?P\w+)__SHIFT\s+(?P\w+)\n')