Skip to content

Commit fa587ff

Browse files
committed
GPU (Linux): fix CI errors
F**k Ubuntu
1 parent 115108b commit fa587ff

1 file changed

Lines changed: 15 additions & 17 deletions

File tree

src/detection/gpu/gpu_linux.c

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -145,25 +145,23 @@ static const char* drmDetectAmdSpecific(const FFGPUOptions* options, FFGPUResult
145145
gpu->frequency = (uint32_t) (gpuInfo.max_engine_clk / 1000u);
146146
gpu->index = FF_GPU_INDEX_UNSET;
147147
gpu->type = gpuInfo.ids_flags & AMDGPU_IDS_FLAGS_FUSION ? FF_GPU_TYPE_INTEGRATED : FF_GPU_TYPE_DISCRETE;
148-
#define FF_VRAM_CASE(x) case AMDGPU_VRAM_TYPE_ ## x: ffStrbufSetStatic(&gpu->memoryType, #x); break
148+
#define FF_VRAM_CASE(name, value) case value /* AMDGPU_VRAM_TYPE_ ## name */: ffStrbufSetStatic(&gpu->memoryType, #name); break
149149
switch (gpuInfo.vram_type)
150150
{
151-
FF_VRAM_CASE(UNKNOWN);
152-
FF_VRAM_CASE(GDDR1);
153-
FF_VRAM_CASE(DDR2);
154-
FF_VRAM_CASE(GDDR3);
155-
FF_VRAM_CASE(GDDR4);
156-
FF_VRAM_CASE(GDDR5);
157-
FF_VRAM_CASE(HBM);
158-
FF_VRAM_CASE(DDR3);
159-
FF_VRAM_CASE(DDR4);
160-
FF_VRAM_CASE(GDDR6);
161-
FF_VRAM_CASE(DDR5);
162-
FF_VRAM_CASE(LPDDR4);
163-
FF_VRAM_CASE(LPDDR5);
164-
#ifdef AMDGPU_VRAM_TYPE_GDDR7
165-
FF_VRAM_CASE(GDDR7);
166-
#endif
151+
FF_VRAM_CASE(UNKNOWN, 0);
152+
FF_VRAM_CASE(GDDR1, 1);
153+
FF_VRAM_CASE(DDR2, 2);
154+
FF_VRAM_CASE(GDDR3, 3);
155+
FF_VRAM_CASE(GDDR4, 4);
156+
FF_VRAM_CASE(GDDR5, 5);
157+
FF_VRAM_CASE(HBM, 6);
158+
FF_VRAM_CASE(DDR3, 7);
159+
FF_VRAM_CASE(DDR4, 8);
160+
FF_VRAM_CASE(GDDR6, 9);
161+
FF_VRAM_CASE(DDR5, 10);
162+
FF_VRAM_CASE(LPDDR4, 11);
163+
FF_VRAM_CASE(LPDDR5, 12);
164+
FF_VRAM_CASE(GDDR7, 13); // assmuming
167165
default:
168166
ffStrbufAppendF(&gpu->memoryType, "Unknown (%u)", gpuInfo.vram_type);
169167
break;

0 commit comments

Comments
 (0)