Skip to content

Commit 41d0f61

Browse files
committed
GPU (AMD): remove usage of ADL2_Adapter_VRAMUsage_Get
It reports dedicated GPU memory usage too. Ref: GPUOpen-LibrariesAndSDKs/display-library#48
1 parent 9de5d90 commit 41d0f61

File tree

2 files changed

+0
-20
lines changed

2 files changed

+0
-20
lines changed

src/detection/gpu/adl.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ extern int ADL2_Adapter_Graphic_Core_Info_Get(ADL_CONTEXT_HANDLE context, int iA
2020
// Function to retrieve memory information from the adapter. Version 2
2121
extern int ADL2_Adapter_MemoryInfo2_Get(ADL_CONTEXT_HANDLE context, int iAdapterIndex, ADLMemoryInfo2* lpMemoryInfo2);
2222

23-
// This function retrieves the VRAM usage of given adapter.
24-
extern int ADL2_Adapter_VRAMUsage_Get(ADL_CONTEXT_HANDLE context, int iAdapterIndex, int* iVRAMUsageInMB);
25-
2623
// This function retrieves the Dedicated VRAM usage of given adapter.
2724
extern int ADL2_Adapter_DedicatedVRAMUsage_Get(ADL_CONTEXT_HANDLE context, int iAdapterIndex, int* iVRAMUsageInMB);
2825

src/detection/gpu/gpu_amd.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ struct FFAdlData {
4949
FF_LIBRARY_SYMBOL(ADL2_Adapter_Graphic_Core_Info_Get)
5050
FF_LIBRARY_SYMBOL(ADL2_Adapter_MemoryInfo2_Get)
5151
FF_LIBRARY_SYMBOL(ADL2_Adapter_DedicatedVRAMUsage_Get)
52-
FF_LIBRARY_SYMBOL(ADL2_Adapter_VRAMUsage_Get)
5352
FF_LIBRARY_SYMBOL(ADL2_Adapter_ASICFamilyType_Get)
5453
FF_LIBRARY_SYMBOL(ADL2_Overdrive_Caps)
5554
FF_LIBRARY_SYMBOL(ADL2_OverdriveN_CapabilitiesX2_Get)
@@ -91,7 +90,6 @@ const char* ffDetectAmdGpuInfo(const FFGpuDriverCondition* cond, FFGpuDriverResu
9190
FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(atiadl, adlData, ADL2_Adapter_Graphic_Core_Info_Get)
9291
FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(atiadl, adlData, ADL2_Adapter_MemoryInfo2_Get)
9392
FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(atiadl, adlData, ADL2_Adapter_DedicatedVRAMUsage_Get)
94-
FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(atiadl, adlData, ADL2_Adapter_VRAMUsage_Get)
9593
FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(atiadl, adlData, ADL2_Adapter_ASICFamilyType_Get)
9694
FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(atiadl, adlData, ADL2_Overdrive_Caps)
9795
FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(atiadl, adlData, ADL2_OverdriveN_CapabilitiesX2_Get)
@@ -196,21 +194,6 @@ const char* ffDetectAmdGpuInfo(const FFGpuDriverCondition* cond, FFGpuDriverResu
196194
}
197195
}
198196

199-
if (result.sharedMemory)
200-
{
201-
int vramUsage = 0;
202-
int status = adlData.ffADL2_Adapter_VRAMUsage_Get(adlData.apiHandle, device->iAdapterIndex, &vramUsage);
203-
FF_DEBUG("ADL2_Adapter_VRAMUsage_Get returned %s (%d), usage: %d MB",
204-
ffAdlStatusToString(status), status, vramUsage);
205-
206-
if (status == ADL_OK && vramUsage >= 0) {
207-
result.sharedMemory->used = (uint64_t) vramUsage * 1024 * 1024;
208-
FF_DEBUG("Shared VRAM usage: %llu bytes (%d MB)", result.sharedMemory->used, vramUsage);
209-
} else {
210-
FF_DEBUG("Failed to get total VRAM usage");
211-
}
212-
}
213-
214197
if (result.memoryType)
215198
{
216199
ADLMemoryInfo2 memoryInfo;

0 commit comments

Comments
 (0)