From 4524c7a1740bda515c364981873d688883fdd8b1 Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Nov 19 2023 22:17:05 +0000
Subject: Fix timestamp related crashes in mesah-asahi-20231118


Imports patch from
https://gitlab.freedesktop.org/asahi/mesa/-/merge_requests/216

---

diff --git a/asahi-Fix-typo-in-arch-check-in-agx_get_gpu_timestam.patch b/asahi-Fix-typo-in-arch-check-in-agx_get_gpu_timestam.patch
new file mode 100644
index 0000000..8e5e267
--- /dev/null
+++ b/asahi-Fix-typo-in-arch-check-in-agx_get_gpu_timestam.patch
@@ -0,0 +1,26 @@
+From 2c222277f56dc72420ad75ba5a902583525f9c78 Mon Sep 17 00:00:00 2001
+From: Janne Grunau <janne-fdr@jannau.net>
+Date: Sun, 19 Nov 2023 22:54:17 +0100
+Subject: [PATCH 1/1] asahi: Fix typo in arch check in agx_get_gpu_timestamp
+
+Signed-off-by: Janne Grunau <janne-fdr@jannau.net>
+---
+ src/asahi/lib/agx_device.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/asahi/lib/agx_device.c b/src/asahi/lib/agx_device.c
+index 6e84baf3f6d..2351ce25ce8 100644
+--- a/src/asahi/lib/agx_device.c
++++ b/src/asahi/lib/agx_device.c
+@@ -673,7 +673,7 @@ agx_debug_fault(struct agx_device *dev, uint64_t addr)
+ uint64_t
+ agx_get_gpu_timestamp(struct agx_device *dev)
+ {
+-#if DETECT_ARCH_ARCH64
++#if DETECT_ARCH_AARCH64
+    uint64_t ret;
+    __asm__ volatile("mrs \t%0, cntvct_el0" : "=r"(ret));
+    return ret;
+-- 
+2.42.0
+
diff --git a/mesa.spec b/mesa.spec
index 40dbef5..89c8261 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -85,6 +85,7 @@ Patch10:        gnome-shell-glthread-disable.patch
 Patch20:	gallium-Avoid-empty-version-scripts-in-pipe-loader.patch
 Patch21:	gallium-Fix-i915-pipe-loader-build.patch
 Patch22:	gallium-Do-not-create-pipe-loader-version-scripts-fo.patch
+Patch23:	asahi-Fix-typo-in-arch-check-in-agx_get_gpu_timestam.patch
 
 BuildRequires:  meson >= 1.2.0
 BuildRequires:  gcc