From 9f7f179691ed0bc3c8fb14dfd0a911f8afbf8d54 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Mon, 2 Sep 2024 14:41:54 -0700
Subject: [PATCH] device-generic-x86_64: include all Intel GPU fw in the
 initramfs (MR 5527)

Newer Intel GPUs won't work without the GUC fw, and older ones still need DMC fw for power management, so let's just include everything... pkgs.alpinelinux.org says the install size is only 9MB...

Note that this was not added to the oem-intel package because it would make the initramfs too big for some devices that depend on oem-intel (e.g. x64-cros)

[ci:skip-build]: already built successfully in CI
---
 .../community/device-generic-x86_64/30-gpu-firmware.files  | 4 ++++
 device/community/device-generic-x86_64/APKBUILD            | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 device/community/device-generic-x86_64/30-gpu-firmware.files

diff --git a/device/community/device-generic-x86_64/30-gpu-firmware.files b/device/community/device-generic-x86_64/30-gpu-firmware.files
new file mode 100644
index 000000000..bf2bcc5ac
--- /dev/null
+++ b/device/community/device-generic-x86_64/30-gpu-firmware.files
@@ -0,0 +1,4 @@
+# Newer integrated and discrete Intel GPUs won't work without GUC fw,
+# and older GPUs need DMC firmware for lower power states, so let's
+# include everything:
+/lib/firmware/i915
diff --git a/device/community/device-generic-x86_64/APKBUILD b/device/community/device-generic-x86_64/APKBUILD
index 478c34de9..4e95bd3c6 100644
--- a/device/community/device-generic-x86_64/APKBUILD
+++ b/device/community/device-generic-x86_64/APKBUILD
@@ -2,7 +2,7 @@
 # Co-Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=device-generic-x86_64
 pkgdesc="Generic x86_64 system, with EFI"
-pkgver=14
+pkgver=15
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -17,6 +17,7 @@ makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	modules-initfs
+	30-gpu-firmware.files
 "
 install="$pkgname.post-install $pkgname.post-upgrade"
 subpackages="
@@ -40,6 +41,9 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
+
+	install -Dm644 "$srcdir"/30-gpu-firmware.files \
+		-t "$pkgdir"/usr/share/mkinitfs/files/
 }
 
 kernel_edge() {
@@ -61,4 +65,5 @@ kernel_lts() {
 sha512sums="
 e9dfcd70ccfb9a0fdaa0cdc52faf3be96d6de8af8c60a758bb703c515b0648cec4552e0eaf56e5168b0004cd3fc4b28118abb05dad2c581d3579a2e9134862cb  deviceinfo
 e464ef0ad4a4c34d2d53f69c4612b612ea878a77c9efdef69b0f842edf701036c8218809fd63aac286d6a08ae07f39e568199fc3e38d145e716c1723e7215019  modules-initfs
+9599a10679a43929e4ed2ea22269a0716219163817574d48db4dc1cb21a0fcf17ea54d77d5fd8efd034905c421ecb3eaa600a72927d683983ce48d1159329881  30-gpu-firmware.files
 "