From 6fc85c2fa0632c02dbfbd7d72154ca07f6b79e4e Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 31 Oct 2023 11:28:41 +0000
Subject: [PATCH] testing/linux-asahi: upgrade to 6.5_p18

enable rust and apple drm
---
 testing/linux-asahi/APKBUILD             |  8 ++++----
 testing/linux-asahi/config-asahi.aarch64 | 18 ++++++++++++++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/testing/linux-asahi/APKBUILD b/testing/linux-asahi/APKBUILD
index 7d549d5eb7e..da319152d43 100644
--- a/testing/linux-asahi/APKBUILD
+++ b/testing/linux-asahi/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=asahi
 pkgname=linux-${_flavor}
-pkgver=6.5_p12
+pkgver=6.5_p18
 
 _rel=${pkgver#*_p}
 kver=${pkgver%_p*}
@@ -14,7 +14,7 @@ url="https://www.kernel.org"
 depends="initramfs-generator"
 _depends_dev="perl gmp-dev elfutils-dev flex bison"
 makedepends="$_depends_dev sed bc linux-headers installkernel
-	linux-firmware-any openssl-dev diffutils findutils"
+	linux-firmware-any openssl-dev diffutils findutils rust"
 options="!strip !check"
 _config=${config:-config-asahi.${CARCH}}
 subpackages="$pkgname-dev:_dev:$CBUILD_ARCH"
@@ -205,7 +205,7 @@ _dev() {
 }
 
 sha512sums="
-6cb2b8bac15f48a4e1bd094b55fc5cbf96a7135bab65520dcc86286dc635437c500427067eee4a6948ee435b3f0499490bb6268d4a4f1f16703a6c3982a4ec44  linux-asahi-6.5-12.tar.gz
-370764937651ad1620586d6c2b7aa022ebffe30d0891ed5e5e0d0383b4a8ae9a5bdb3b97036ba79a09a105bde0461edfb5b3ae6ff86674762643acdaf883c9fd  config-asahi.aarch64
+dc7740a9734bcdbc6020eefff611a7614781d665c643129f755d01bb7774a67ee89b5a5fb7814c3397ee6a58b013d4889f3182d9f19cab244b86281c6642ec24  linux-asahi-6.5-18.tar.gz
+6f0a51a08c83dfa0a5144cd7fdb0d3b6ecdbe2dd7ce8315fc3ace8d9441d54412d0a96cdc62781ebadfd244dff519940d6cd83c3335a685c68ae49688134b00b  config-asahi.aarch64
 49dfcbc7e3d6d01fde548bfa4174e011fbb36ece94853d856e028f768da3ab156f77c01e0642e6d91f5f024f0c97d5de5847bb064e2a033f3237dfc66768049e  sensors.patch
 "
diff --git a/testing/linux-asahi/config-asahi.aarch64 b/testing/linux-asahi/config-asahi.aarch64
index c9c881bcee9..2d9c44d73d6 100644
--- a/testing/linux-asahi/config-asahi.aarch64
+++ b/testing/linux-asahi/config-asahi.aarch64
@@ -2,15 +2,16 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 6.5.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.1.1_git20230722) 13.1.1 20230722"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130101
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24100
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24100
 CONFIG_LLD_VERSION=0
+CONFIG_RUST_IS_AVAILABLE=y
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -18,6 +19,7 @@ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
+CONFIG_CONSTRUCTORS=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -251,6 +253,9 @@ CONFIG_PERF_EVENTS=y
 
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 # CONFIG_PROFILING is not set
+CONFIG_RUST=y
+CONFIG_RUSTC_VERSION_TEXT="rustc 1.72.1 (d5c2e9c34 2023-09-13) (Alpine Linux 1.72.1-r0)"
+CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.66.1"
 # end of General setup
 
 CONFIG_ARM64=y
@@ -3866,6 +3871,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_GEM_DMA_HELPER=y
 CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_SCHED=y
 
 #
 # I2C encoder or helper chips
@@ -3889,6 +3895,11 @@ CONFIG_DRM_GEM_SHMEM_HELPER=y
 # CONFIG_DRM_NOUVEAU is not set
 # CONFIG_DRM_VGEM is not set
 # CONFIG_DRM_VKMS is not set
+CONFIG_RUST_DRM_SCHED=y
+CONFIG_RUST_DRM_GEM_SHMEM_HELPER=y
+CONFIG_RUST_APPLE_RTKIT=y
+CONFIG_DRM_ASAHI=m
+# CONFIG_DRM_ASAHI_DEBUG_ALLOCATOR is not set
 # CONFIG_DRM_VMWGFX is not set
 # CONFIG_DRM_UDL is not set
 # CONFIG_DRM_AST is not set
@@ -6600,5 +6611,8 @@ CONFIG_ARCH_USE_MEMTEST=y
 #
 # Rust hacking
 #
+# CONFIG_RUST_DEBUG_ASSERTIONS is not set
+CONFIG_RUST_OVERFLOW_CHECKS=y
+# CONFIG_RUST_BUILD_ASSERT_ALLOW is not set
 # end of Rust hacking
 # end of Kernel hacking