From 3181deafea985026756e1886644a7c271d14e3d5 Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Jan 20 2024 15:13:55 +0000
Subject: bump Linux UABI for asahi-6.6-15


---

diff --git a/0001-fixup-asahi-Implement-Linux-UAPI.patch b/0001-fixup-asahi-Implement-Linux-UAPI.patch
new file mode 100644
index 0000000..64a0f6e
--- /dev/null
+++ b/0001-fixup-asahi-Implement-Linux-UAPI.patch
@@ -0,0 +1,76 @@
+From 77e1e754aab8012dea86bdd292fc42796b306944 Mon Sep 17 00:00:00 2001
+From: Asahi Lina <lina@asahilina.net>
+Date: Wed, 17 Jan 2024 21:05:16 +0900
+Subject: [PATCH 1/1] fixup! asahi: Implement Linux UAPI
+
+non-scratch version of
+https://gitlab.freedesktop.org/asahi/mesa/-/commit/c84cd37b96511798780099a91206cf6620f5baeb?merge_request_iid=234
+---
+ include/drm-uapi/asahi_drm.h         | 9 +++++----
+ src/gallium/drivers/asahi/agx_pipe.c | 2 +-
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/include/drm-uapi/asahi_drm.h b/include/drm-uapi/asahi_drm.h
+index 630d7921cc3..5b9f283b574 100644
+--- a/include/drm-uapi/asahi_drm.h
++++ b/include/drm-uapi/asahi_drm.h
+@@ -16,7 +16,7 @@
+ extern "C" {
+ #endif
+ 
+-#define DRM_ASAHI_UNSTABLE_UABI_VERSION		10009
++#define DRM_ASAHI_UNSTABLE_UABI_VERSION		10010
+ 
+ #define DRM_ASAHI_GET_PARAMS			0x00
+ #define DRM_ASAHI_VM_CREATE			0x01
+@@ -352,6 +352,8 @@ struct drm_asahi_cmd_render {
+ 
+ 	__u32 vertex_helper_program;
+ 	__u32 fragment_helper_program;
++	__u32 vertex_helper_cfg;
++	__u32 fragment_helper_cfg;
+ 	__u64 vertex_helper_arg;
+ 	__u64 fragment_helper_arg;
+ 
+@@ -446,7 +448,7 @@ struct drm_asahi_cmd_render {
+ #define ASAHI_RENDER_UNK_SET_LOAD_BGOBJVALS	(1UL << 23)
+ #define ASAHI_RENDER_UNK_SET_FRG_UNK_38		(1UL << 24)
+ #define ASAHI_RENDER_UNK_SET_FRG_UNK_3C		(1UL << 25)
+-#define ASAHI_RENDER_UNK_SET_FRG_UNK_40		(1UL << 26)
++
+ #define ASAHI_RENDER_UNK_SET_RELOAD_ZLSCTRL	(1UL << 27)
+ #define ASAHI_RENDER_UNK_SET_UNK_BUF_10		(1UL << 28)
+ #define ASAHI_RENDER_UNK_SET_FRG_UNK_MASK	(1UL << 29)
+@@ -483,7 +485,6 @@ struct drm_asahi_cmd_render_unknowns {
+ 	__u64 load_bgobjvals;
+ 	__u64 frg_unk_38;
+ 	__u64 frg_unk_3c;
+-	__u64 frg_unk_40;
+ 	__u64 reload_zlsctrl;
+ 	__u64 unk_buf_10;
+ 	__u64 frg_unk_mask;
+@@ -512,7 +513,7 @@ struct drm_asahi_cmd_compute {
+ 	__u32 pad;
+ 
+ 	__u32 helper_program;
+-	__u32 helper_unk; /* ? */
++	__u32 helper_cfg;
+ 	__u64 helper_arg;
+ 
+ 	__u32 encoder_id;
+diff --git a/src/gallium/drivers/asahi/agx_pipe.c b/src/gallium/drivers/asahi/agx_pipe.c
+index add44c01f87..006e454190b 100644
+--- a/src/gallium/drivers/asahi/agx_pipe.c
++++ b/src/gallium/drivers/asahi/agx_pipe.c
+@@ -1632,7 +1632,7 @@ agx_flush_compute(struct agx_context *ctx, struct agx_batch *batch,
+       .encoder_end = batch->cdm.bo->ptr.gpu +
+                      (batch->cdm.current - (uint8_t *)batch->cdm.bo->ptr.cpu),
+       .helper_arg = 0,
+-      .helper_unk = 0,
++      .helper_cfg = 0,
+       .helper_program = 0,
+       .sampler_array =
+          batch->sampler_heap.bo ? batch->sampler_heap.bo->ptr.gpu : 0,
+-- 
+2.43.0
+
diff --git a/mesa.spec b/mesa.spec
index 43a9847..c218ab8 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -70,7 +70,7 @@
 Name:           mesa
 Summary:        Mesa graphics libraries
 Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release:        %autorelease -b 1
+Release:        %autorelease -b 2
 License:        MIT
 URL:            http://www.mesa3d.org
 
@@ -83,6 +83,8 @@ Source1:        Mesa-MLAA-License-Clarification-Email.txt
 
 Patch10:        gnome-shell-glthread-disable.patch
 
+Patch20:        0001-fixup-asahi-Implement-Linux-UAPI.patch
+
 BuildRequires:  meson >= 1.2.0
 BuildRequires:  gcc
 BuildRequires:  gcc-c++