Skip to content

Commit 0328d07

Browse files
MikhailzrickMikhailzrick
committed
update-amd-tdp
Update es_features.yml Update tdp_hooks.sh Update batocera-amd-tdp Update batocera-amd-tdp amd-tdp-update update
1 parent 06616e7 commit 0328d07

File tree

4 files changed

+94
-94
lines changed

4 files changed

+94
-94
lines changed

‎board/batocera/x86/fsoverlay/etc/pm/sleep.d/99resume_tdp

+28-32
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,44 @@
11
#!/bin/bash
22

3+
# check we have a max system TDP value
4+
CPU_TDP=$(/usr/bin/batocera-settings-get system.cpu.tdp)
5+
# if not, we exit as the CPU is not supported by the TDP values
6+
if [ -z "$CPU_TDP" ]; then
7+
echo "No CPU TDP value found."
8+
exit 0
9+
fi
10+
11+
TDP_SAVED="/var/run/amd_tdp_saved"
12+
313
# set the final TDP value
414
set_tdp() {
5-
echo "Setting AMD Processor TDP to ${1}W"
6-
/usr/bin/batocera-amd-tdp $1
15+
local TDP_VALUE=$1
16+
17+
echo "Setting AMD Processor TDP to ${TDP_VALUE}W"
18+
/usr/bin/batocera-amd-tdp "${TDP_VALUE}"
719
}
820

9-
# determine the new TDP value based on max TDP
10-
handle_tdp() {
11-
TDP_PERCENTAGE=$1
12-
MAX_TDP=$(/usr/bin/batocera-settings-get system.cpu.tdp)
13-
# Check if MAX_TDP is defined and non-empty
14-
if [ -n "$MAX_TDP" ]; then
15-
# round the value up or down to make bash happy
16-
TDP_VALUE=$(awk -v max_tdp="$MAX_TDP" -v tdp_percentage="$TDP_PERCENTAGE" 'BEGIN { printf("%.0f\n", max_tdp * tdp_percentage / 100) }')
17-
set_tdp "${TDP_VALUE}"
18-
else
19-
echo "Max TDP is not defined, cannot set TDP."
20-
exit 1
21+
save_tdp() {
22+
local CURRENT_TDP=$(ryzenadj -i | grep 'PPT LIMIT FAST' | awk '{printf "%.0f\n", $6}')
23+
24+
if [[ "$CURRENT_TDP" =~ ^[0-9]+$ && "$CPU_TDP" =~ ^[0-9]+$ ]] && [ "$CURRENT_TDP" -ne "$CPU_TDP" ]; then
25+
echo "$CURRENT_TDP" > "$TDP_SAVED"
2126
fi
2227
}
2328

2429
case "$1" in
30+
suspend|hibernate)
31+
# We want to save the current TDP to restore after resuming from suspend
32+
save_tdp
33+
;;
2534
resume|thaw)
26-
# check we have a max system TDP value
27-
CPU_TDP=$(/usr/bin/batocera-settings-get system.cpu.tdp)
28-
# if not, we exit as the CPU is not supported by the TDP values
29-
if [ -z "$CPU_TDP" ]; then
30-
echo "No CPU TDP value found."
35+
if [ ! -s "$TDP_SAVED" ]; then
36+
echo "No saved TDP value before suspending found."
3137
exit 0
3238
else
33-
TDP_SETTING=$(printf "%.0f" "$(/usr/bin/batocera-settings-get global.tdp)")
34-
if [ -z "${TDP_SETTING}" ]; then
35-
TDP_SETTING="$(/usr/bin/batocera-settings-get-master system.cpu.tdp)"
36-
37-
if [ -n "${TDP_SETTING}" ]; then
38-
set_tdp "${TDP_SETTING}"
39-
else
40-
echo "TDP setting is not defined, cannot set TDP."
41-
exit 1
42-
fi
43-
else
44-
handle_tdp "${TDP_SETTING}"
45-
fi
39+
local SAVED_VALUE=$(cat "$TDP_SAVED")
40+
set_tdp "${SAVED_VALUE}"
41+
rm -f "$TDP_SAVED" # Clean up after restoring
4642
fi
4743
;;
4844
esac

‎package/batocera/core/batocera-configgen/scripts/tdp_hooks.sh

+63-59
Original file line numberDiff line numberDiff line change
@@ -20,89 +20,93 @@ fi
2020

2121
# set the final tdp value
2222
set_tdp() {
23-
echo "Game ${2} requested setting AMD Mobile Processor TDP to ${1} Watts" >> $log
24-
/usr/bin/batocera-amd-tdp $1
23+
local TDP_VALUE=$1
24+
local ROM_NAME=$2
25+
26+
if [ -z "${ROM_NAME}" ]; then
27+
echo "Setting AMD Mobile Processor TDP to ${TDP_VALUE} Watts" >> $log
28+
else
29+
echo "Game ${ROM_NAME} requested setting AMD Mobile Processor TDP to ${TDP_VALUE} Watts" >> $log
30+
fi
31+
32+
/usr/bin/batocera-amd-tdp "$TDP_VALUE"
2533
}
2634

2735
# determine the new TDP value based on max TDP
2836
handle_tdp() {
29-
TDP_PERCENTAGE=$1
30-
ROM_NAME=$2
31-
MAX_TDP=$(/usr/bin/batocera-settings-get system.cpu.tdp)
32-
# Check if MAX_TDP is defined and non-empty
33-
if [ -n "$MAX_TDP" ]; then
37+
local TDP_PERCENTAGE=$1
38+
local ROM_NAME=$2
39+
40+
# Check if TDP is defined and non-empty
41+
if [ -n "$CPU_TDP" ]; then
3442
# round the value up or down to make bash happy
35-
TDP_VALUE=$(awk -v max_tdp="$MAX_TDP" -v tdp_percentage="$TDP_PERCENTAGE" 'BEGIN { printf("%.0f\n", max_tdp * tdp_percentage / 100) }')
43+
TDP_VALUE=$(awk -v max_tdp="$CPU_TDP" -v tdp_percentage="$TDP_PERCENTAGE" 'BEGIN { printf("%.0f\n", max_tdp * tdp_percentage / 100) }')
3644
set_tdp "${TDP_VALUE}" "${ROM_NAME}"
3745
else
3846
echo "A maximum TDP is not defined, cannot set TDP." >> $log
3947
exit 1
4048
fi
4149
}
4250

43-
# Check for events
44-
EVENT=$1
45-
SYSTEM_NAME=$2
46-
ROM_PATH=$5
51+
handle_game_stop() {
52+
TDP_SETTING=$(printf "%.0f" "$(/usr/bin/batocera-settings-get global.tdp)")
53+
if [ -z "${TDP_SETTING}" ]; then
54+
local CURRENT_TDP=$(ryzenadj -i | grep 'PPT LIMIT FAST' | awk '{printf "%.0f\n", $6}')
4755

48-
# Get the rom name from ROM_PATH
49-
ROM_NAME=$(basename "$ROM_PATH")
56+
if [[ "$CURRENT_TDP" =~ ^[0-9]+$ && "$CPU_TDP" =~ ^[0-9]+$ ]] && [ "$CURRENT_TDP" -ne "$CPU_TDP" ]; then
57+
set_tdp "${CPU_TDP}"
58+
fi
59+
else
60+
handle_tdp "${TDP_SETTING}"
61+
fi
5062

51-
# exit accordingly if the event is neither gameStart nor gameStop
52-
if [ "$EVENT" != "gameStart" ] && [ "$EVENT" != "gameStop" ]; then
5363
exit 0
54-
fi
64+
}
5565

56-
# handle gameStop event
57-
if [ "$EVENT" == "gameStop" ]; then
58-
# set either user global setting or default tdp
59-
TDP_SETTING=$(printf "%.0f" "$(/usr/bin/batocera-settings-get global.tdp)")
60-
if [ -z "${TDP_SETTING}" ]; then
61-
TDP_SETTING="$(/usr/bin/batocera-settings-get system.cpu.tdp)"
62-
63-
if [ -n "$TDP_SETTING" ]; then
64-
set_tdp "${TDP_SETTING}" "STOP"
65-
else
66-
echo "No TDP setting defined, cannot set TDP." >> $log
67-
exit 1
66+
handle_game_start() {
67+
local SYSTEM_NAME="$1"
68+
local ROM_PATH="$2"
69+
70+
# Extract the base game name
71+
ROM_NAME="${ROM_PATH##*/}"
72+
73+
# check for user set system specific setting
74+
if [ -n "${SYSTEM_NAME}" ]; then
75+
# check for rom specific config
76+
TDP_SETTING=$(/usr/bin/batocera-settings-get "${SYSTEM_NAME}[\"${ROM_NAME}\"].tdp")
77+
if [ -z "${TDP_SETTING}" ]; then
78+
TDP_SETTING="$(/usr/bin/batocera-settings-get ${SYSTEM_NAME}.tdp)"
6879
fi
69-
exit 0
7080
fi
71-
handle_tdp "${TDP_SETTING}" "STOP"
72-
exit 0
73-
fi
7481

75-
# run through determining the desired TDP setting
76-
# check for user set system specific setting
77-
if [ -n "${SYSTEM_NAME}" ]; then
78-
# check for rom specific config
79-
TDP_SETTING=$(/usr/bin/batocera-settings-get "${SYSTEM_NAME}[\"${ROM_NAME}\"].tdp")
82+
# If no user set system specific setting check for user set global setting
8083
if [ -z "${TDP_SETTING}" ]; then
81-
TDP_SETTING="$(/usr/bin/batocera-settings-get ${SYSTEM_NAME}.tdp)"
84+
TDP_SETTING=$(printf "%.0f" "$(/usr/bin/batocera-settings-get global.tdp)")
8285
fi
83-
fi
8486

85-
# If no user set system specific setting check for user set global setting
86-
if [ -z "${TDP_SETTING}" ]; then
87-
TDP_SETTING=$(printf "%.0f" "$(/usr/bin/batocera-settings-get global.tdp)")
88-
fi
89-
90-
# If no value is found ensure tdp is default before exiting
91-
if [ -z "${TDP_SETTING}" ]; then
92-
TDP_SETTING="$(/usr/bin/batocera-settings-get-master system.cpu.tdp)"
87+
# now apply TDP percentage accordingly
9388
if [ -n "${TDP_SETTING}" ]; then
94-
set_tdp "${TDP_SETTING}" "${ROM_NAME}"
89+
handle_tdp "${TDP_SETTING}" "${ROM_NAME}"
9590
else
9691
echo "No TDP setting defined, cannot set TDP." >> $log
9792
exit 1
98-
fi
99-
exit 0
100-
fi
93+
fi
94+
}
10195

102-
# now apply TDP percentage accordingly
103-
if [ -n "${TDP_SETTING}" ]; then
104-
handle_tdp "${TDP_SETTING}" "${ROM_NAME}"
105-
else
106-
echo "No TDP setting defined, cannot set TDP." >> $log
107-
exit 1
108-
fi
96+
# Check for events
97+
SYSTEM_NAME="$2"
98+
ROM_PATH="$5"
99+
100+
case "$1" in
101+
gameStart)
102+
handle_game_start "$SYSTEM_NAME" "$ROM_PATH"
103+
;;
104+
gameStop)
105+
handle_game_stop
106+
;;
107+
*)
108+
exit 0
109+
;;
110+
esac
111+
112+
exit 0

‎package/batocera/core/batocera-scripts/scripts/batocera-amd-tdp

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ fi
7070
WATTS=$((TDP * 1000))
7171

7272
# Set TDP using ryzenadj
73-
if /usr/bin/ryzenadj --stapm-limit="${WATTS}" --fast-limit="${WATTS}" --slow-limit="$((WATTS * 80 / 100))" --tctl-temp=95; then
73+
if /usr/bin/ryzenadj --stapm-limit="${WATTS}" --fast-limit="${WATTS}" --slow-limit="${WATTS}"; then
7474
echo "TDP of $TDP Watts has been set" >> "$log"
7575
else
7676
echo "Error setting TDP. Please check the logs for more information." >> "$log"

‎package/batocera/emulationstation/batocera-es-system/es_features.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ shared:
2424
group: POWER OPTIONS
2525
prompt: RYZEN THERMAL DESIGN POWER
2626
description: Adjust the percentage of power (watts) provided to a Ryzen Mobile Series CPU based on it's default max value. Caution, setting wattage too high could damage your device.
27-
preset: slider
28-
preset_parameters: 10 130 5 100 %
27+
preset: sliderauto
28+
preset_parameters: 10 130 5 %
2929
videomode:
3030
prompt: VIDEO MODE
3131
description: Set the display's resolution. Does not affect the rendering resolution.

0 commit comments

Comments
 (0)