nvapi-gpu: Do not include current usage in current available memory

jp7677 · Aug 17, 2024 · 283e5f9 · 283e5f9
1 parent b33a244
commit 283e5f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/nvapi_gpu.cpp b/src/nvapi_gpu.cpp
@@ -424,7 +424,7 @@ extern "C" {
                 pMemoryInfoV2->systemVideoMemory = memoryInfo.DedicatedSystemMemory;
                 pMemoryInfoV2->sharedSystemMemory = memoryInfo.SharedSystemMemory;
                 pMemoryInfoV2->availableDedicatedVideoMemory = memoryInfo.DedicatedVideoMemory - memoryInfo.ReservedVideoMemory; // See comment above
-                pMemoryInfoV2->curAvailableDedicatedVideoMemory = memoryBudgetInfo.Budget - memoryBudgetInfo.CurrentUsage;
+                pMemoryInfoV2->curAvailableDedicatedVideoMemory = memoryBudgetInfo.Budget;
                 break;
             }
             case NV_DISPLAY_DRIVER_MEMORY_INFO_VER_3: {
@@ -433,7 +433,7 @@ extern "C" {
                 pMemoryInfoV3->systemVideoMemory = memoryInfo.DedicatedSystemMemory;
                 pMemoryInfoV3->sharedSystemMemory = memoryInfo.SharedSystemMemory;
                 pMemoryInfoV3->availableDedicatedVideoMemory = memoryInfo.DedicatedVideoMemory - memoryInfo.ReservedVideoMemory; // See comment above
-                pMemoryInfoV3->curAvailableDedicatedVideoMemory = memoryBudgetInfo.Budget - memoryBudgetInfo.CurrentUsage;
+                pMemoryInfoV3->curAvailableDedicatedVideoMemory = memoryBudgetInfo.Budget;
                 pMemoryInfoV3->dedicatedVideoMemoryEvictionsSize = 0;
                 pMemoryInfoV3->dedicatedVideoMemoryEvictionCount = 0;
                 break;
@@ -473,7 +473,7 @@ extern "C" {
                 pMemoryInfoV1->sharedSystemMemory = memoryInfo.SharedSystemMemory;
                 // See comment in NvAPI_GPU_GetMemoryInfo
                 pMemoryInfoV1->availableDedicatedVideoMemory = memoryInfo.DedicatedVideoMemory - memoryInfo.ReservedVideoMemory;
-                pMemoryInfoV1->curAvailableDedicatedVideoMemory = memoryBudgetInfo.Budget - memoryBudgetInfo.CurrentUsage;
+                pMemoryInfoV1->curAvailableDedicatedVideoMemory = memoryBudgetInfo.Budget;
                 pMemoryInfoV1->dedicatedVideoMemoryEvictionsSize = 0;
                 pMemoryInfoV1->dedicatedVideoMemoryEvictionCount = 0;
                 pMemoryInfoV1->dedicatedVideoMemoryPromotionsSize = 0;

diff --git a/tests/nvapi_sysinfo.cpp b/tests/nvapi_sysinfo.cpp
@@ -580,7 +580,7 @@ TEST_CASE("Sysinfo methods succeed", "[.sysinfo]") {
             REQUIRE(info.systemVideoMemory == 1014 * 1024);
             REQUIRE(info.sharedSystemMemory == 16382 * 1024);
             REQUIRE(info.availableDedicatedVideoMemory == 8191 * 1024);
-            REQUIRE(info.curAvailableDedicatedVideoMemory == 3072 * 1024);
+            REQUIRE(info.curAvailableDedicatedVideoMemory == 4096 * 1024);
         }
 
         SECTION("GetMemoryInfo (V3) returns OK") {
@@ -591,7 +591,7 @@ TEST_CASE("Sysinfo methods succeed", "[.sysinfo]") {
             REQUIRE(info.systemVideoMemory == 1014 * 1024);
             REQUIRE(info.sharedSystemMemory == 16382 * 1024);
             REQUIRE(info.availableDedicatedVideoMemory == 8191 * 1024);
-            REQUIRE(info.curAvailableDedicatedVideoMemory == 3072 * 1024);
+            REQUIRE(info.curAvailableDedicatedVideoMemory == 4096 * 1024);
             REQUIRE(info.dedicatedVideoMemoryEvictionsSize == 0);
             REQUIRE(info.dedicatedVideoMemoryEvictionCount == 0);
         }
@@ -639,7 +639,7 @@ TEST_CASE("Sysinfo methods succeed", "[.sysinfo]") {
             REQUIRE(info.systemVideoMemory == 1014 * 1024);
             REQUIRE(info.sharedSystemMemory == 16382 * 1024);
             REQUIRE(info.availableDedicatedVideoMemory == 8191 * 1024);
-            REQUIRE(info.curAvailableDedicatedVideoMemory == 3072 * 1024);
+            REQUIRE(info.curAvailableDedicatedVideoMemory == 4096 * 1024);
             REQUIRE(info.dedicatedVideoMemoryEvictionsSize == 0);
             REQUIRE(info.dedicatedVideoMemoryEvictionCount == 0);
             REQUIRE(info.dedicatedVideoMemoryPromotionsSize == 0);