Fix same memory for different GPUs

Author: sergiye

OpenHardwareMonitorLib/Hardware/Gpu/NvidiaGpu.cs

@@ -696,14 +696,31 @@ public override void Update()
             }
         }
 
-        if (_displayHandle != null)
+        if (NvApi.NvAPI_GPU_GetMemoryInfoEx != null || _displayHandle != null)
         {
-            NvApi.NvMemoryInfo memoryInfo = GetMemoryInfo(out status);
+            uint free = 0;
+            uint total = 0;
+
+            //Size in bytes
+            NvApi.NvMemoryInfoEx memoryInfoEx = GetMemoryInfoEx(out status);
             if (status == NvApi.NvStatus.OK)
             {
-                uint free = memoryInfo.CurrentAvailableDedicatedVideoMemory;
-                uint total = memoryInfo.DedicatedVideoMemory;
+                free = (uint)(memoryInfoEx.CurrentAvailableDedicatedVideoMemory / 1024);
+                total = (uint)(memoryInfoEx.DedicatedVideoMemory / 1024);
+            }
+            else
+            {
+                //Size in kilobytes, fallback for older drivers
+                NvApi.NvMemoryInfo memoryInfo = GetMemoryInfo(out status);
+                if (status == NvApi.NvStatus.OK)
+                {
+                    free = memoryInfo.CurrentAvailableDedicatedVideoMemory;
+                    total = memoryInfo.DedicatedVideoMemory;
+                }
+            }
 
+            if (status == NvApi.NvStatus.OK)
+            {
                 _memoryTotal.Value = total / 1024;
                 ActivateSensor(_memoryTotal);
 
@@ -1136,6 +1153,23 @@ private NvApi.NvMemoryInfo GetMemoryInfo(out NvApi.NvStatus status)
         return status == NvApi.NvStatus.OK ? memoryInfo : default;
     }
 
+    private NvApi.NvMemoryInfoEx GetMemoryInfoEx(out NvApi.NvStatus status)
+    {
+        if (NvApi.NvAPI_GPU_GetMemoryInfoEx == null)
+        {
+            status = NvApi.NvStatus.Error;
+            return default;
+        }
+
+        NvApi.NvMemoryInfoEx memoryInfoEx = new()
+        {
+            Version = (uint)NvApi.MAKE_NVAPI_VERSION<NvApi.NvMemoryInfoEx>(1)
+        };
+
+        status = NvApi.NvAPI_GPU_GetMemoryInfoEx(_handle, ref memoryInfoEx);
+        return status == NvApi.NvStatus.OK ? memoryInfoEx : default;
+    }
+
     private NvApi.NvGpuClockFrequencies GetClockFrequencies(out NvApi.NvStatus status)
     {
         if (NvApi.NvAPI_GPU_GetAllClockFrequencies == null)

OpenHardwareMonitorLib/Interop/NvApi.cs

@@ -41,6 +41,7 @@ internal static class NvApi
     public static NvAPI_GPU_GetCoolerSettingsDelegate NvAPI_GPU_GetCoolerSettings { get; internal set; }
     public static NvAPI_GPU_GetDynamicPstatesInfoExDelegate NvAPI_GPU_GetDynamicPstatesInfoEx { get; internal set; }
     public static NvAPI_GPU_GetMemoryInfoDelegate NvAPI_GPU_GetMemoryInfo { get; internal set; }
+    public static NvAPI_GPU_GetMemoryInfoExDelegate NvAPI_GPU_GetMemoryInfoEx { get; internal set; }
     public static NvAPI_GPU_GetPCIIdentifiersDelegate NvAPI_GPU_GetPCIIdentifiers { get; internal set; }
     public static NvAPI_GPU_GetTachReadingDelegate NvAPI_GPU_GetTachReading { get; internal set; }
     public static NvAPI_GPU_GetThermalSettingsDelegate NvAPI_GPU_GetThermalSettings { get; internal set; }
@@ -83,6 +84,7 @@ public static void Initialize()
             NvAPI_GPU_GetCoolerSettings = GetDelegate<NvAPI_GPU_GetCoolerSettingsDelegate>(0xDA141340);
             NvAPI_GPU_SetCoolerLevels = GetDelegate<NvAPI_GPU_SetCoolerLevelsDelegate>(0x891FA0AE);
             NvAPI_GPU_GetMemoryInfo = GetDelegate<NvAPI_GPU_GetMemoryInfoDelegate>(0x774AA982);
+            NvAPI_GPU_GetMemoryInfoEx = GetDelegate<NvAPI_GPU_GetMemoryInfoExDelegate>(0xC0599498);
             NvAPI_GetDisplayDriverVersion = GetDelegate<NvAPI_GetDisplayDriverVersionDelegate>(0xF951A4D1);
             _nvAPI_GetInterfaceVersionString = GetDelegate<NvAPI_GetInterfaceVersionStringDelegate>(0x01053FA5);
             NvAPI_GPU_GetPCIIdentifiers = GetDelegate<NvAPI_GPU_GetPCIIdentifiersDelegate>(0x2DDFB66E);
@@ -145,6 +147,9 @@ public static void Initialize()
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     public delegate NvStatus NvAPI_GPU_GetMemoryInfoDelegate(NvDisplayHandle displayHandle, ref NvMemoryInfo nvMemoryInfo);
 
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public delegate NvStatus NvAPI_GPU_GetMemoryInfoExDelegate(NvPhysicalGpuHandle gpuHandle, ref NvMemoryInfoEx nvMemoryInfo);
+
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     public delegate NvStatus NvAPI_GPU_GetPCIIdentifiersDelegate(NvPhysicalGpuHandle gpuHandle, out uint deviceId, out uint subSystemId, out uint revisionId, out uint extDeviceId);
 
@@ -575,6 +580,24 @@ internal struct NvMemoryInfo
         public uint CurrentAvailableDedicatedVideoMemory;
     }
 
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct NvMemoryInfoEx
+    {
+        public uint Version;
+        public ulong DedicatedVideoMemory;
+        public ulong AvailableDedicatedVideoMemory;
+        public ulong SystemVideoMemory;
+        public ulong SharedSystemMemory;
+
+        public ulong CurrentAvailableDedicatedVideoMemory;
+
+        public ulong DedicatedVideoMemoryEvictionsSize;
+        public ulong DedicatedVideoMemoryEvictionCount;
+
+        public ulong DedicatedVideoMemoryPromotionsSize;
+        public ulong DedicatedVideoMemoryPromotionCount;
+    }
+
     [StructLayout(LayoutKind.Sequential, Pack = 8)]
     internal struct NvDisplayDriverVersion
     {