From dde9e5282387f6313bbab2b45a21c5fb8ce3e956 Mon Sep 17 00:00:00 2001 From: NecromancerForLife <140229913+NecromancerForLife@users.noreply.github.com> Date: Thu, 31 Aug 2023 10:14:40 +0200 Subject: [PATCH] reading the proposed Total Board Power for RX 7000 Cards (#1123) * reading the proposed Total Board Power for RX 7000 Cards * undo requested changes * Update AmdGpu.cs --------- Co-authored-by: Peter Hindelang Co-authored-by: PhyxionNL <7643972+PhyxionNL@users.noreply.github.com> --- Aga.Controls/Aga.Controls.csproj | 2 +- LibreHardwareMonitorLib/Hardware/Gpu/AmdGpu.cs | 11 ++++++++++- LibreHardwareMonitorLib/Interop/AtiAdlxx.cs | 3 ++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Aga.Controls/Aga.Controls.csproj b/Aga.Controls/Aga.Controls.csproj index cafa9fa..bc554cc 100644 --- a/Aga.Controls/Aga.Controls.csproj +++ b/Aga.Controls/Aga.Controls.csproj @@ -1,4 +1,4 @@ - + 9.0.30729 net472 diff --git a/LibreHardwareMonitorLib/Hardware/Gpu/AmdGpu.cs b/LibreHardwareMonitorLib/Hardware/Gpu/AmdGpu.cs index 97ee0b7..995258e 100644 --- a/LibreHardwareMonitorLib/Hardware/Gpu/AmdGpu.cs +++ b/LibreHardwareMonitorLib/Hardware/Gpu/AmdGpu.cs @@ -346,9 +346,18 @@ internal sealed class AmdGpu : GenericGpu GetPMLog(logDataOutput, AtiAdlxx.ADLSensorType.PMLOG_INFO_ACTIVITY_GFX, _coreLoad, reset: false); GetPMLog(logDataOutput, AtiAdlxx.ADLSensorType.PMLOG_INFO_ACTIVITY_MEM, _memoryLoad); - GetPMLog(logDataOutput, AtiAdlxx.ADLSensorType.PMLOG_ASIC_POWER, _powerTotal, reset: false); + if (_adapterInfo.AdapterName.Contains("AMD Radeon RX 7")) + { + GetPMLog(logDataOutput, AtiAdlxx.ADLSensorType.PMLOG_TOTAL_BOARD_POWER_RX_7000, _powerTotal, reset: false); + } + else + { + GetPMLog(logDataOutput, AtiAdlxx.ADLSensorType.PMLOG_ASIC_POWER, _powerTotal, reset: false); + } + GetPMLog(logDataOutput, AtiAdlxx.ADLSensorType.PMLOG_GFX_POWER, _powerCore, reset: false); GetPMLog(logDataOutput, AtiAdlxx.ADLSensorType.PMLOG_SOC_POWER, _powerSoC, reset: false); + } } } diff --git a/LibreHardwareMonitorLib/Interop/AtiAdlxx.cs b/LibreHardwareMonitorLib/Interop/AtiAdlxx.cs index a7da518..1bfa52a 100644 --- a/LibreHardwareMonitorLib/Interop/AtiAdlxx.cs +++ b/LibreHardwareMonitorLib/Interop/AtiAdlxx.cs @@ -553,6 +553,7 @@ internal static class AtiAdlxx PMLOG_CLK_VCN1CLK2 = 37, PMLOG_SMART_POWERSHIFT_CPU = 38, PMLOG_SMART_POWERSHIFT_DGPU = 39, - PMLOG_MAX_SENSORS_REAL + PMLOG_MAX_SENSORS_REAL, + PMLOG_TOTAL_BOARD_POWER_RX_7000 = 73 } }