From d6ece34418d75c5604aab8aa2e634b9c1b1bd4dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= <marcin.slusarz@intel.com>
Date: Fri, 5 May 2023 14:55:37 +0200
Subject: [PATCH] intel/tools: decode ACTHD printed by newer kernels

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22874>
---
 src/intel/tools/aubinator_error_decode.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/intel/tools/aubinator_error_decode.c b/src/intel/tools/aubinator_error_decode.c
index 58d009ee707..9124c28397f 100644
--- a/src/intel/tools/aubinator_error_decode.c
+++ b/src/intel/tools/aubinator_error_decode.c
@@ -566,6 +566,14 @@ read_data_file(FILE *file)
          if (matched == 2)
             acthd = ((uint64_t)reg << 32) | reg2;
 
+         matched = sscanf(line, "  ACTHD_LDW: 0x%08x\n", &reg);
+         if (matched == 1)
+            acthd = reg;
+
+         matched = sscanf(line, "  ACTHD_UDW: 0x%08x\n", &reg);
+         if (matched == 1)
+            acthd |= (uint64_t)reg << 32;
+
          matched = sscanf(line, "  PGTBL_ER: 0x%08x\n", &reg);
          if (matched == 1 && reg)
             print_pgtbl_err(reg, &devinfo);