Skip to content

Commit

Permalink
Sync to upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
uejji committed Aug 31, 2024
2 parents 3e7adf2 + ea355a7 commit 0a5a93f
Show file tree
Hide file tree
Showing 21 changed files with 89 additions and 72 deletions.
3 changes: 1 addition & 2 deletions PKGBUILD/linux/0021-rog-ally-support.patch
Original file line number Diff line number Diff line change
Expand Up @@ -219,14 +219,13 @@ diff -rupN linux-6.10.7.orig/drivers/platform/x86/asus-wmi.c linux-6.10.7/driver

if (!wmi_has_guid(ASUS_WMI_MGMT_GUID)) {
pr_warn("ASUS Management GUID not found\n");
@@ -4943,6 +4990,11 @@ static int asus_wmi_probe(struct platfor
@@ -4943,6 +4990,10 @@ static int asus_wmi_probe(struct platfor
return ret;
}

+ err = acpi_register_lps0_dev(&asus_ally_s2idle_dev_ops);
+ if (err)
+ pr_warn("failed to register LPS0 sleep handler in asus-wmi\n");
+
+
return asus_wmi_add(pdev);
}
Expand Down
25 changes: 0 additions & 25 deletions PKGBUILD/linux/0040-Add-Atari-VCS-quirk.patch

This file was deleted.

37 changes: 37 additions & 0 deletions PKGBUILD/linux/0040-amdgpu-quirks.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From 1c5b0dfc807fac142f004c581817a94bbaca8a48 Mon Sep 17 00:00:00 2001
From: fewtarius <88717793+fewtarius@users.noreply.github.com>
Date: Tue, 28 May 2024 18:54:32 +0200
Subject: [PATCH 40/41] Add Atari VCS quirk

---
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 99dbd2341120..e9ce71fced4b 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -1170,6 +1170,10 @@ static const struct amdgpu_gfxoff_quirk amdgpu_gfxoff_quirk_list[] = {
{ 0x1002, 0x15dd, 0x103c, 0x83e7, 0xd3 },
/* GFXOFF is unstable on C6 parts with a VBIOS 113-RAVEN-114 */
{ 0x1002, 0x15dd, 0x1002, 0x15dd, 0xc6 },
+ /* GFXOFF is unstable on revision 91 (Atari VCS) with 113-RAVEN2-117 */
+ { 0x1002, 0x15D8, 0x1002, 0x15D8, 0x91 },
+ /* GFXOFF is unstable on revision 0xc3 (Ayaneo Air) with 113-CEZANNE-018 */
+ { 0x1002, 0x1637, 0x1002, 0x1637, 0xc3 },
/* Apple MacBook Pro (15-inch, 2019) Radeon Pro Vega 20 4 GB */
{ 0x1002, 0x69af, 0x106b, 0x019a, 0xc0 },
{ 0, 0, 0, 0, 0 },
diff -rupN linux-6.10.5.orig/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c linux-6.10.5/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
--- linux-6.10.5.orig/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 2024-08-14 13:34:38.000000000 +0000
+++ linux-6.10.5/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 2024-08-28 15:53:20.432207108 +0000
@@ -1883,6 +1883,7 @@ static int amdgpu_device_init_apu_flags(
break;
case CHIP_RENOIR:
if ((adev->pdev->device == 0x1636) ||
+ (adev->pdev->device == 0x1638) ||
(adev->pdev->device == 0x164c))
adev->apu_flags |= AMD_APU_IS_RENOIR;
else
--
2.43.2
12 changes: 6 additions & 6 deletions PKGBUILD/linux/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
# Mikael Eriksson <mikael_eriksson@miffe.org>

pkgbase=linux
pkgver=6.10.6
pkgrel=3.13
pkgver=6.10.7
pkgrel=1.11
pkgdesc="Linux Stable"
arch=(x86_64)
url="https://kernel.org/"
Expand Down Expand Up @@ -52,7 +52,7 @@ source=(
0036-Updated-AW87xxx-driver-to-automatically-enumerate-a-.patch
0037-Updated-AW87xxx-driver-to-implement-Suspend-and-Resu.patch
0038-fixup-aw87xx-warnings.patch
0040-Add-Atari-VCS-quirk.patch
0040-amdgpu-quirks.patch
0050-AMD-Pstate-Core-Performance-Boost.patch
0051-drm-amd-display-let-update_planes_and_stream_state-d.patch
0052-asus-armoury-support.patch
Expand All @@ -68,23 +68,23 @@ validpgpkeys=(
'A2FF3A36AAA56654109064AB19802F8B0D70FC30' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
'41241ee072911fa0f3f7f304c8c077e8be79a50197a4ac470d4cf9d8e77278d9' # config
'42c3bfa828ee1ae08e1e9fc2ab275a95191f3dc7311da14e196f0455fabea224' # config
'2fde7b646741397b0847ff71fe42ec178aef7de2436cc5531b0e725e878dccf8' # 0001-drm-panel-orientation-quirks.patch
'783da391e0f45635eefb583b8b3acc29cd62a0c9eeefedf7f790dc2f89c7e279' # 0006-Ayaneo-geek-headset-patch.patch
'33edff1a51ceb763c47b3ae485f5857a716a1dac9f1e8b65c3b93c6e88a4838f' # 0007-ayaneo-2-headphone-fix.patch
'c6867ab6a95146e796dee888283fdae95837b8f53487e659f6d66bc458054b14' # 0008-ayaneo-1s-hp-fix.patch
'f3a54e5bde55f8481cb4e9e3c8fce7a28ae7a7e42208c5f76bdcc6d8dcf6fc08' # 0012-HACK-add-KConfig-to-enable-driver-specific-color-mgm.patch
'683128d044f4df12dcb0a7b2858075f510d870460dc71f0d60f69df89cf62419' # 0013-Don-t-create-color_mgmt_properties-on-asics-SIENNA_C.patch
'b42fa6bb0e3d93aa8a81f61543c2058fa6f8412b9ad190110ffb49c46e81d5ce' # 0020-add-devices-to-oxp-sensors.patch
'd192b10d221a0c4f3bc240e86f737487bfc342ee420307f3ce8cb39681dc92be' # 0021-rog-ally-support.patch
'5ad40e06f24343d706592a9cfa9aa81c42f435fb7f857ad51c2c9c9b774346ca' # 0021-rog-ally-support.patch
'd4bc9044e7e3290d6885d08b8360b61744dc4227a723aa178f9041284e062f08' # 0031-IIO-add-aya-neo-tablet-identifier.patch
'dc8218b5cf4b505a51c77712e54b944f01560d37a0e7630160d5f5776023cfda' # 0032-iio-imu-Add-driver-for-Bosch-BMI260-IMU.patch
'5508dedc920022b728489eb3ebbf7235fe48a7822d3c654cd678388c743442b9' # 0033-Codec-Add-aw87xxx-codec-with-partial-acpi-implementa.patch
'a1b744c20d676e248b2da55abf5314c533cf98ec2bcf0b9b008dedfe4ebfb9ef' # 0034-Updated-AW87xxx-driver-to-be-more-verbose-for-debugg.patch
'73a88310ac0077bedd4a4e49689c06cb8460c55774cea1395d90f9ac57252e8c' # 0036-Updated-AW87xxx-driver-to-automatically-enumerate-a-.patch
'4f3baa6a367659341873ec7443d6238044cca521e04c0a868322221ac50149ff' # 0037-Updated-AW87xxx-driver-to-implement-Suspend-and-Resu.patch
'23d91695bf8e5d5cdb9503a47468c6c5cf220bc7966a4720aa46645357e29ee6' # 0038-fixup-aw87xx-warnings.patch
'1822769c05fd3b2126870a853c41ab167a95cf91d23f0d50bb103838857489eb' # 0040-Add-Atari-VCS-quirk.patch
'2728588169bb1e1b4d9987c0732a316e39670f0c873429179b894ddc6be9b0fa' # 0040-amdgpu-quirks.patch
'c6ff653b1e55c5524b237a40683a34240d4ec7b95e524441ed3ae09ed885f674' # 0050-AMD-Pstate-Core-Performance-Boost.patch
'7c7df8d4427c807e2cea0f1e147efcdfb1e7c1c5271823cc6bb49f10b1846d19' # 0051-drm-amd-display-let-update_planes_and_stream_state-d.patch
'543bf5b9cd779a6f89845bf160aee1a2594c5df0ad4fd2f7f975920a99ad082f' # 0052-asus-armoury-support.patch
Expand Down
26 changes: 13 additions & 13 deletions PKGBUILD/linux/config
Original file line number Diff line number Diff line change
Expand Up @@ -6766,24 +6766,24 @@ CONFIG_DRM_MIPI_DSI=y
# CONFIG_DRM_DEBUG_MM is not set
CONFIG_DRM_KMS_HELPER=y
CONFIG_DRM_FBDEV_EMULATION=y
CONFIG_DRM_FBDEV_OVERALLOC=100
CONFIG_DRM_FBDEV_OVERALLOC=200
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_DISPLAY_HELPER=m
CONFIG_DRM_DISPLAY_HELPER=y
CONFIG_DRM_DISPLAY_DP_HELPER=y
CONFIG_DRM_DISPLAY_HDCP_HELPER=y
CONFIG_DRM_DISPLAY_HDMI_HELPER=y
CONFIG_DRM_DP_AUX_CHARDEV=y
CONFIG_DRM_DP_CEC=y
CONFIG_DRM_TTM=m
CONFIG_DRM_EXEC=m
CONFIG_DRM_GPUVM=m
CONFIG_DRM_BUDDY=m
CONFIG_DRM_TTM=y
CONFIG_DRM_EXEC=y
CONFIG_DRM_GPUVM=y
CONFIG_DRM_BUDDY=y
CONFIG_DRM_VRAM_HELPER=m
CONFIG_DRM_TTM_HELPER=m
CONFIG_DRM_TTM_HELPER=y
CONFIG_DRM_GEM_DMA_HELPER=m
CONFIG_DRM_GEM_SHMEM_HELPER=y
CONFIG_DRM_SUBALLOC_HELPER=m
CONFIG_DRM_SCHED=m
CONFIG_DRM_SUBALLOC_HELPER=y
CONFIG_DRM_SCHED=y

#
# I2C encoder or helper chips
Expand All @@ -6799,8 +6799,8 @@ CONFIG_DRM_I2C_NXP_TDA9950=m
#
# end of ARM devices

# CONFIG_DRM_RADEON is not set
# CONFIG_DRM_RADEON_USERPTR is not set
CONFIG_DRM_RADEON=m
CONFIG_DRM_RADEON_USERPTR=y
CONFIG_DRM_AMDGPU=m
CONFIG_DRM_AMDGPU_SI=y
CONFIG_DRM_AMDGPU_CIK=y
Expand Down Expand Up @@ -7045,15 +7045,15 @@ CONFIG_HDMI=y
#
# Console display driver support
#
CONFIG_VGA_CONSOLE=y
# CONFIG_VGA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
CONFIG_DUMMY_CONSOLE_COLUMNS=80
CONFIG_DUMMY_CONSOLE_ROWS=25
CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
# end of Console display driver support

# CONFIG_LOGO is not set
Expand Down
13 changes: 13 additions & 0 deletions PKGBUILD/steam-powerbuttond/0002-fix-finding-user.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/steam-powerbuttond b/steam-powerbuttond
index 273bb76..310cb75 100755
--- a/steam-powerbuttond
+++ b/steam-powerbuttond
@@ -95,7 +95,7 @@ def __init__():
def get_user():
global user
global home_path
- command = "who | awk '{print $1}' | sort | head -1"
+ command = "id -nu 1000"

while not user:
users = subprocess.Popen(
6 changes: 4 additions & 2 deletions PKGBUILD/steam-powerbuttond/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Maintainer: Fewtarius
# Thanks to upsteam maintainer: Derek J. Clark <derekjohn.clark@gmail.com>
pkgname=steam-powerbuttond
pkgver=20240630
pkgver=20240829
pkgrel=2
pkgdesc="Simple powerbutton daemon for steam with gamescope-session"
arch=('any')
Expand All @@ -12,9 +12,11 @@ depends=('python' 'python-evdev')
optdepends=()
makedepends=('git')
source=("${pkgname}::git+${url}.git"
0001-Don-t-install-to-usr-local.patch)
0001-Don-t-install-to-usr-local.patch
0002-fix-finding-user.patch)
sha256sums=('SKIP'
'2ada504d2cbc0f3bbcc53226be9fcf2ff7abae4e41d46f3568cd9c4ad40e18c4' # 0001-Don-t-install-to-usr-local.patch
'af4913f01377ba9cad03588decee29e7e170e0288df1597446ac0403ed96387b' # 0002-fix-finding-user.patch
)

package() {
Expand Down
2 changes: 1 addition & 1 deletion PKGBUILD/steamfork-device-support/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Maintainer: Fewtarius

pkgname=steamfork-device-support
pkgver=2024.08.28
pkgver=2024.08.30
pkgrel=1.11
pkgdesc='Hardware support provider for PC handhelds.'
arch=('any')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
export X11_ROTATION=left
export GAMESCOPE_RES="-W 1280 -H 720 -w 1280 -h 720"
export GAMESCOPE_ADDITIONAL_OPTIONS="--force-orientation left"
export STEAMFORK_GRUB_ADDITIONAL_CMDLINEOPTIONS="${STEAMFORK_GRUB_ADDITIONAL_CMDLINEOPTIONS} fbcon=nodefer"

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion PKGBUILD/steamfork-installer/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Maintainer: Fewtarius

pkgname=steamfork-installer
pkgver=2024.07.26
pkgver=2024.08.29
pkgrel=1
pkgdesc='Installation utility for SteamFork.'
arch=('any')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ class InstallerApp(QMainWindow):
self.central_widget.addWidget(installation_page)

self.setCentralWidget(self.central_widget)
self.setMinimumSize(950, 700)
self.setMinimumSize(480, 600)
title=f"{DistroName} Installer"
self.setWindowTitle(title)

Expand Down
2 changes: 0 additions & 2 deletions rootfs/installer/airootfs/etc/plymouth/plymouthd.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@
[Daemon]
Theme=steamos
ShowDelay=0
DeviceScale=1
DeviceTimeout=8
2 changes: 1 addition & 1 deletion rootfs/steamfork/postcopy/etc/default/grub
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source steamfork-devicequirk-set
GRUB_DEFAULT=0
GRUB_TIMEOUT=0
GRUB_DISTRIBUTOR=SteamFork
GRUB_CMDLINE_LINUX_DEFAULT="quiet splash systemd.show_status=0 loglevel=0 plymouth.nolog ${STEAMFORK_GRUB_ADDITIONAL_CMDLINEOPTIONS}"
GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 loglevel=3 splash quiet plymouth.ignore-serial-consoles ${STEAMFORK_GRUB_ADDITIONAL_CMDLINEOPTIONS}"
GRUB_SAVEDEFAULT="false"
GRUB_DISABLE_LINUX_UUID=true
GRUB_DEVICE="LABEL=sf_root"
Expand Down
2 changes: 1 addition & 1 deletion rootfs/steamfork/postcopy/etc/mkinitcpio.conf
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ FILES=()
#
## NOTE: If you have /usr on a separate partition, you MUST include the
# usr and fsck hooks.
HOOKS=(base udev plymouth autodetect modconf kms keyboard keymap consolefont block filesystems steamfork fsck)
HOOKS=(base udev autodetect modconf kms keyboard keymap consolefont block filesystems steamfork fsck plymouth)

# COMPRESSION
# Use this to compress the initramfs image. By default, zstd compression
Expand Down
2 changes: 0 additions & 2 deletions rootfs/steamfork/postcopy/etc/plymouth/plymouthd.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@
[Daemon]
Theme=steamos
ShowDelay=0
DeviceScale=1
DeviceTimeout=8

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
wireplumber.profiles = {
main = {
monitor.libcamera = disabled
}
}
2 changes: 1 addition & 1 deletion rootfs/steamfork/presets/minimal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ export STEAMOS_PKGS="acl
shared-mime-info
sqlite
squashfs-tools
steamos-atomupd-client-git
steamos-atomupd-client
steamos-devkit-service
steamos-efi
steamos-log-submitter
Expand Down
8 changes: 4 additions & 4 deletions rootfs/steamfork/presets/rel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export STEAMOS_PKGS="accounts-qml-module
aspell-en
assimp
at-spi2-core
atomupd-daemon-git
atomupd-daemon
atkmm
attr
audit
Expand Down Expand Up @@ -280,7 +280,6 @@ export STEAMOS_PKGS="accounts-qml-module
kdialog
kdsoap
kdsoap-ws-discovery-client
kdumpst
kemoticons
kexec-tools
keyutils
Expand Down Expand Up @@ -819,10 +818,9 @@ export STEAMOS_PKGS="accounts-qml-module
steam_notif_daemon
steamdeck-dsp
steamdeck-kde-presets
steamos-atomupd-client-git
steamos-atomupd-client
steamos-devkit-service
steamos-efi
steamos-kdumpst-layer
steamos-log-submitter
steamos-manager
steamos-networking-tools
Expand Down Expand Up @@ -963,6 +961,7 @@ export STEAMOS_PKGS="accounts-qml-module
# kded
# kdesu
# kdnssd
# kdumpst
# kfilemetadata
# kgamma5
# kglobalaccel
Expand Down Expand Up @@ -1017,6 +1016,7 @@ export STEAMOS_PKGS="accounts-qml-module
# solid
# sonnet
# steamos-customizations-jupiter
# steamos-kdumpst-layer
# syndication
# syntax-highlighting
# systemd-swap
Expand Down

0 comments on commit 0a5a93f

Please sign in to comment.