From 745b49c8133a0b53ccb9726a1b4681a7656d0ff6 Mon Sep 17 00:00:00 2001
From: RJ Trujillo <eyecantcu@pm.me>
Date: Sun, 26 May 2024 11:01:39 -0600
Subject: [PATCH 1/2] feat: Ship ryzenadj on desktop images

Signed-off-by: RJ Trujillo <eyecantcu@pm.me>
---
 Containerfile                                                   | 2 +-
 system_files/{deck => desktop}/shared/usr/etc/default/ryzenadj  | 0
 .../shared/usr/lib/systemd/system/ryzenadj.service              | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename system_files/{deck => desktop}/shared/usr/etc/default/ryzenadj (100%)
 rename system_files/{deck => desktop}/shared/usr/lib/systemd/system/ryzenadj.service (100%)

diff --git a/Containerfile b/Containerfile
index 437e4250..32f2da8b 100644
--- a/Containerfile
+++ b/Containerfile
@@ -290,6 +290,7 @@ RUN rpm-ostree install \
         compsize \
         input-remapper \
         system76-scheduler \
+        ryzenadj \
         powertop \
         i2c-tools \
         udica \
@@ -694,7 +695,6 @@ RUN rpm-ostree install \
     vpower \
     ds-inhibit \
     steam_notif_daemon \
-    ryzenadj \
     sdgyrodsu \
     ibus-pinyin \
     ibus-table-chinese-cangjie \
diff --git a/system_files/deck/shared/usr/etc/default/ryzenadj b/system_files/desktop/shared/usr/etc/default/ryzenadj
similarity index 100%
rename from system_files/deck/shared/usr/etc/default/ryzenadj
rename to system_files/desktop/shared/usr/etc/default/ryzenadj
diff --git a/system_files/deck/shared/usr/lib/systemd/system/ryzenadj.service b/system_files/desktop/shared/usr/lib/systemd/system/ryzenadj.service
similarity index 100%
rename from system_files/deck/shared/usr/lib/systemd/system/ryzenadj.service
rename to system_files/desktop/shared/usr/lib/systemd/system/ryzenadj.service

From 7270f60fbf33c3575e483d4855c37adb5a2d9802 Mon Sep 17 00:00:00 2001
From: RJ Trujillo <eyecantcu@pm.me>
Date: Sun, 26 May 2024 11:11:47 -0600
Subject: [PATCH 2/2] fix(framework/amd): Allow MMIO access in userspace for
 ryzenadjxy

Signed-off-by: RJ Trujillo <eyecantcu@pm.me>
---
 .../desktop/shared/usr/libexec/bazzite-hardware-setup    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup b/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup
index a2c89a6b..c77ac3f3 100755
--- a/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup
+++ b/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup
@@ -7,7 +7,7 @@ IMAGE_FLAVOR=$(jq -r '."image-flavor"' < $IMAGE_INFO)
 FEDORA_VERSION=$(jq -r '."fedora-version"' < $IMAGE_INFO)
 
 # SCRIPT VERSION
-HWS_VER=40
+HWS_VER=41
 HWS_VER_FILE="/etc/bazzite/hws_version"
 HWS_VER_RAN=$(cat $HWS_VER_FILE)
 
@@ -59,7 +59,12 @@ if [[ $IMAGE_NAME =~ "deck" && ":AOKZOE A1 AR07:" =~ ":$SYS_ID:" ]]; then
 fi
 
 if [[ ":Framework:" =~ ":$VEN_ID:" ]]; then
-  if [[ "GenuineIntel" == "$CPU_VENDOR" ]]; then
+  if [[ "AuthenticAMD" == "$CPU_VENDOR" ]]; then
+    if [[ ! $KARGS =~ "iomem" ]]; then
+      echo "AMD Framework Laptop detected, adding needed kargs for ryzenadj"
+      NEEDED_KARGS+=("--append-if-missing=iomem=relaxed")
+    fi
+  elif [[ "GenuineIntel" == "$CPU_VENDOR" ]]; then
     if [[ ! $KARGS =~ "hid_sensor_hub" ]]; then
       echo "Intel Framework Laptop detected, applying needed keyboard fix"
       NEEDED_KARGS+=("--append-if-missing=module_blacklist=hid_sensor_hub");