Skip to content
This repository has been archived by the owner on Oct 12, 2024. It is now read-only.

Commit

Permalink
fix shutdown regression on 6.6.31
Browse files Browse the repository at this point in the history
  • Loading branch information
antheas committed May 31, 2024
1 parent 6b3d20a commit dc40b63
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 4 deletions.
23 changes: 23 additions & 0 deletions 6.6/0000-undo-shutdown-hang-opt.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
@@ -226,18 +226,8 @@
struct amdgpu_device *adev = smu->adev;
int ret = 0;

- if (!en && adev->in_s4) {
- /* Adds a GFX reset as workaround just before sending the
- * MP1_UNLOAD message to prevent GC/RLC/PMFW from entering
- * an invalid state.
- */
- ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_GfxDeviceDriverReset,
- SMU_RESET_MODE_2, NULL);
- if (ret)
- return ret;
-
+ if (!en && !adev->in_s0ix)
ret = smu_cmn_send_smc_msg(smu, SMU_MSG_PrepareMp1ForUnload, NULL);
- }

return ret;
}

11 changes: 7 additions & 4 deletions 6.6/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkgbase=linux-handheld
pkgver=6.6.32
pkgrel=1
pkgrel=3
pkgdesc='Linux Kernel optimized for Handheld Devices.'
url='https://www.kernel.org'
arch=(x86_64)
Expand All @@ -27,8 +27,6 @@ source=(
# 0003-Default-to-maximum-amount-of-ASLR-bits.patch
# 0005-fix-doc-build.patch

# Patch from redhat (the patches are based on a fedora kernel)

#
# linux-fsync patches
#
Expand Down Expand Up @@ -66,6 +64,9 @@ source=(
# Already part of 6.6
# 0003-atomic-fb-null.patch

# Fix 6.6.31 regression on shutdown
0000-undo-shutdown-hang-opt.patch

# Allow disabling boost on pstate
# https://www.phoronix.com/news/AMD-Core-Perf-Boost-Linux
# https://lore.kernel.org/linux-pm/cover.1706255676.git.perry.yuan@amd.com/
Expand Down Expand Up @@ -113,6 +114,7 @@ source=(
# steamdeck oled patches
# Also relevant for the go
steamdeck-oled-wifi.patch
# Part of upstream 6.6 (at least partly)
steamdeck-oled-bt.patch
steamdeck-oled-audio.patch
steamdeck-oled-hw-quirks.patch
Expand Down Expand Up @@ -181,6 +183,7 @@ sha256sums=('aaa824eaf07f61911d22b75ff090a403c3dd0bd73e23933e0bba8b5971436ce1'
'3f51da66ee66e6189a637eb266e76e03fe3e2055786d9b836699b80b35132f00'
'78e68e8599c1dd66ed00361a05f05cab54a4f2feac85fd2ff8989063bb9ec473'
'fe92488c881243fe75e98e28b337856593ee78a0a2d411b4c70fe2b81088169c'
'14320b13909cc7f54f52eaddb4df6f0680efcdd1e5d034a84e6e350162d40215'
'0e440f246e21a860b753466bf5151e1300152a92aac74d3ddb9a5dfbbf9686af'
'164fd2d20154c9d2bfc6ef92c768e9b4eaa547b5eb257736a4c9b2e0f5e9bcd1'
'c590b0f2a9039662087ac4c205f17fc3daa51ac8c4bd0a2c3fdccc1b4d97b2b1'
Expand Down Expand Up @@ -394,7 +397,7 @@ _package-headers() {

pkgname=(
"$pkgbase"
"$pkgbase-headers"
# "$pkgbase-headers"
)
for _p in "${pkgname[@]}"; do
eval "package_$_p() {
Expand Down

0 comments on commit dc40b63

Please sign in to comment.