Skip to content

Commit

Permalink
refactor: move GPU fix functions to separate file
Browse files Browse the repository at this point in the history
  • Loading branch information
@honjow
honjow committed Jan 9, 2025
1 parent 8565741 commit 3276eea
Show file tree
Hide file tree
Showing 2 changed files with 324 additions and 315 deletions.
318 changes: 3 additions & 315 deletions py_modules/gpu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
INTEL_GPU_MIN_LIMIT,
logger,
)
from gpu_fix import fix_gpuFreqSlider_AMD, fix_gpuFreqSlider_INTEL
from inotify import IN_MODIFY, notify


Expand Down Expand Up @@ -420,328 +421,15 @@ def fix_gpuFreqSlider(self):
return

if os.path.exists(AMD_GPULEVEL_PATH):
self.fix_gpuFreqSlider_AMD()
fix_gpuFreqSlider_AMD()
elif os.path.exists(INTEL_GPU_MAX_FREQ) and os.path.exists(
INTEL_GPU_MIN_FREQ
):
self.fix_gpuFreqSlider_INTEL()
fix_gpuFreqSlider_INTEL()
except Exception as e:
logger.error(e, exc_info=True)
pass

def _get_intel_gpu_base_script(self) -> str:
"""获取 Intel GPU 基础脚本。
生成用于获取 Intel GPU 设备路径和频率限制的基础脚本。
Returns:
str: 基础脚本内容
"""
return """ GPU=$(grep -H 0x8086 /sys/class/drm/card?/device/vendor 2>/dev/null | head -n1 | sed 's/\/device\/vendor:.*//')
GPU_MIN_FREQ="$GPU/gt_min_freq_mhz"
GPU_MAX_FREQ="$GPU/gt_max_freq_mhz"
GPU_MIN_LIMIT="$(cat $GPU/gt_RPn_freq_mhz)"
GPU_MAX_LIMIT="$(cat $GPU/gt_RP0_freq_mhz)\""""

def _get_intel_gpu_auto_script(self) -> str:
"""获取 Intel GPU 自动模式脚本。
生成用于处理 auto 模式的脚本，设置 GPU 频率为默认范围。
Returns:
str: auto 模式脚本内容
"""
return """ echo "setting intel gpu $GPU to [$WRITE_VALUE]" | systemd-cat -t p-steamos-priv-write -p warning
if [[ "$WRITE_VALUE" == "auto" ]]; then
echo "$GPU_MIN_LIMIT" >"$GPU_MIN_FREQ"
echo "$GPU_MAX_LIMIT" >"$GPU_MAX_FREQ"
echo "commit: $GPU_MIN_LIMIT -> $GPU_MIN_FREQ" | systemd-cat -t p-steamos-priv-write -p warning
echo "commit: $GPU_MAX_LIMIT -> $GPU_MAX_FREQ" | systemd-cat -t p-steamos-priv-write -p warning
fi
exit 0"""

def _get_intel_gpu_manual_script(self) -> str:
"""获取 Intel GPU 手动模式脚本。
生成用于处理手动模式的脚本，允许用户设置自定义的 GPU 频率范围。
Returns:
str: 手动模式脚本内容
"""
return """ echo "commit: GPU -> $WRITE_VALUE" | systemd-cat -t p-steamos-priv-write -p warning
if [[ "$WRITE_VALUE" =~ "s 0" ]]; then
min_freq=$(echo "$WRITE_VALUE" | sed 's/.*s 0 //')
if [[ "$(cat $GPU_MAX_FREQ)" -lt "$min_freq" ]]; then
echo "commit: $GPU_MAX_FREQ -> $min_freq" | systemd-cat -t p-steamos-priv-write -p warning
echo "$min_freq" >"$GPU_MAX_FREQ"
fi
if [[ "$min_freq" -lt "$GPU_MIN_LIMIT" ]]; then
min_freq="$GPU_MIN_LIMIT"
fi
if [[ "$min_freq" -gt "$GPU_MAX_LIMIT" ]]; then
min_freq="$GPU_MIN_LIMIT"
fi
echo "commit: $min_freq -> $GPU_MIN_FREQ" | systemd-cat -t p-steamos-priv-write -p warning
echo "$min_freq" >"$GPU_MIN_FREQ"
fi
if [[ "$WRITE_VALUE" =~ "s 1" ]]; then
max_freq=$(echo "$WRITE_VALUE" | sed 's/.*s 1 //')
if [[ "$max_freq" -gt "$GPU_MAX_LIMIT" ]]; then
max_freq="$GPU_MAX_LIMIT"
fi
echo "commit: $max_freq -> $GPU_MAX_FREQ" | systemd-cat -t p-steamos-priv-write -p warning
echo "$max_freq" >"$GPU_MAX_FREQ"
fi
exit 0"""

def _get_intel_gpu_script(self, path: str) -> str:
"""生成完整的 Intel GPU 控制脚本。
根据路径类型生成相应的 GPU 控制脚本。
Args:
path: GPU 控制文件路径
Returns:
str: 完整的脚本内容
"""
base_script = self._get_intel_gpu_base_script()
if path == "power_dpm_force_performance_level":
return base_script + "\n" + self._get_intel_gpu_auto_script()
else:
return base_script + "\n" + self._get_intel_gpu_manual_script()

def fix_gpuFreqSlider_INTEL(self) -> bool:
"""修复 Intel GPU 频率滑块功能。
修改 steamos-priv-write 脚本，确保其能正确处理 Intel GPU 的频率控制。
主要处理两个控制文件：
1. power_dpm_force_performance_level：自动模式控制
2. pp_od_clk_voltage：手动频率控制
Returns:
bool: 操作是否成功
"""
steamos_priv_path = "/usr/bin/steamos-polkit-helpers/steamos-priv-write"
gpu_control_paths = [
"power_dpm_force_performance_level", # 自动模式控制
"pp_od_clk_voltage", # 手动频率控制
]

# 读取并更新脚本内容
try:
with open(steamos_priv_path, "r") as file:
script_content = file.read()
except IOError as e:
logger.error(f"Failed to read {steamos_priv_path}: {e}")
return False

# 处理每个控制路径
script_modified = False
for control_path in gpu_control_paths:
new_control_code = self._get_intel_gpu_script(control_path)
updated_script = self._update_steamos_priv_script(
script_content, control_path, new_control_code
)

if updated_script != script_content:
script_content = updated_script
script_modified = True

# 如果有更新，写入文件
if script_modified:
try:
with open(steamos_priv_path, "w") as file:
file.write(script_content)
logger.info("Successfully updated steamos-priv-write script")
return True
except IOError as e:
logger.error(f"Failed to write to {steamos_priv_path}: {e}")
return False

logger.info("No updates needed for steamos-priv-write script")
return True

def _update_steamos_priv_script(
self, script: str, path: str, new_then_code: str
) -> str:
"""更新 steamos-priv-write 脚本中的目标代码块。
Args:
script: 原始脚本内容
path: 目标路径
new_then_code: 新的 then 代码块
Returns:
str: 更新后的脚本内容
"""
# 匹配目标 if 语句
pattern = r'\nif \[\[ "\$WRITE_PATH" == /sys/class/drm/card\*/device/{0} \]\];'.format(
re.escape(path)
)

# 先找到所有匹配的起始位置
matches = list(re.finditer(pattern, script))

if matches:
# 对于每个匹配，找到对应的完整代码块
for match in matches:
# 注意：start_pos 现在包含了换行符，所以不需要调整
start_pos = match.start()
# 从匹配位置开始查找下一个 fi
remaining_text = script[start_pos:]
fi_match = re.search(r"\bfi\b", remaining_text)
if fi_match:
end_pos = start_pos + fi_match.end()
block = script[start_pos:end_pos]
# 更新 then 代码块
updated_block = re.sub(
r"\nthen([\s\S]*?)\nfi",
f"\nthen\n{new_then_code}\nfi",
block,
)
# 更新脚本内容
script = script.replace(block, updated_block)
return script

# 如果没找到，查找 DeclineWrite 的位置
decline_pos = script.find("\nDeclineWrite")
if decline_pos != -1:
return False, "", decline_pos

# 如果找不到 DeclineWrite，就放在文件末尾
return False, "", len(script)

def fix_gpuFreqSlider_AMD(self):
"""修复 AMD GPU 频率滑块功能。
修改 steamos-priv-write 脚本，确保其能正确处理 AMD GPU 的频率控制。
主要处理两个控制文件：
1. power_dpm_force_performance_level：性能级别控制
2. pp_od_clk_voltage：频率和电压控制
Returns:
bool: 操作是否成功
"""
steamos_priv_path = "/usr/bin/steamos-polkit-helpers/steamos-priv-write"
gpu_control_paths = [
"power_dpm_force_performance_level", # 性能级别控制
"pp_od_clk_voltage", # 频率和电压控制
]

try:
# 读取原始脚本
with open(steamos_priv_path, "r") as file:
script_content = file.read()
except IOError as e:
logger.error(f"无法读取 steamos-priv-write 脚本: {e}")
return False

# 跟踪是否有修改
script_modified = False

# 处理每个控制路径
for path in gpu_control_paths:
# 生成新的代码块
new_code_block = self._create_amd_gpu_script_block(path)

# 在脚本中查找对应的部分
found, existing_block, position = self._find_script_section(
script_content, path
)

if found:
# 如果找到现有代码块且内容不同，则更新
if existing_block.strip() != new_code_block.strip():
logger.info(f"更新 AMD GPU 控制代码块: {path}")
script_content = script_content.replace(
existing_block, new_code_block
)
script_modified = True
else:
# 如果没找到，在 DeclineWrite 之前添加新代码块
logger.info(f"添加新的 AMD GPU 控制代码块: {path}")
script_content = (
script_content[:position]
+ new_code_block
+ script_content[position:]
)
script_modified = True

# 如果有修改，写回文件
if script_modified:
try:
with open(steamos_priv_path, "w") as file:
file.write(script_content)
logger.info("成功更新 steamos-priv-write 脚本")
return True
except IOError as e:
logger.error(f"写入 steamos-priv-write 脚本失败: {e}")
return False

logger.info("AMD GPU 控制脚本无需更新")
return True

def _create_amd_gpu_script_block(self, path: str) -> str:
"""创建 AMD GPU 控制脚本块。
为指定的路径创建完整的 if 条件块，包括路径匹配和执行命令。
Args:
path: GPU 控制文件路径（如 power_dpm_force_performance_level）
Returns:
完整的脚本代码块
"""
return f"""
if [[ "$WRITE_PATH" == /sys/class/drm/card*/device/{path} ]]; then
WRITE_PATH=$(ls /sys/class/drm/*/device/{path} | head -n 1)
CommitWrite
fi
"""

def _find_script_section(self, script: str, path: str) -> tuple[bool, str, int]:
"""在脚本中查找特定路径的代码段。
Args:
script: 完整的脚本内容
path: 要查找的 GPU 控制文件路径
Returns:
tuple[bool, str, int]:
- 是否找到匹配的代码段
- 找到的代码段内容（如果有）
- 代码段的起始位置（如果有）或建议插入的位置
"""
# 匹配目标 if 语句
pattern = r'\nif \[\[ "\$WRITE_PATH" == /sys/class/drm/card\*/device/{0} \]\];'.format(
re.escape(path)
)

# 先找到所有匹配的起始位置
matches = list(re.finditer(pattern, script))

if matches:
# 对于每个匹配，找到对应的完整代码块
for match in matches:
# 注意：start_pos 现在包含了换行符，所以不需要调整
start_pos = match.start()
# 从匹配位置开始查找下一个 fi
remaining_text = script[start_pos:]
fi_match = re.search(r"\bfi\b", remaining_text)
if fi_match:
end_pos = start_pos + fi_match.end()
block = script[start_pos:end_pos]
return True, block, start_pos

# 如果没找到，查找 DeclineWrite 的位置
decline_pos = script.find("\nDeclineWrite")
if decline_pos != -1:
return False, "", decline_pos

# 如果找不到 DeclineWrite，就放在文件末尾
return False, "", len(script)

def get_gpuFreqMin(self):
gpuFreqMin, _ = self.get_gpuFreqRange()
return gpuFreqMin
Expand Down
Loading

0 comments on commit 3276eea

Please sign in to comment.