Skip to content

Commit 11d7eec

Browse files
committed
Revert "FreeBSD: debug"
This reverts commit 6508ccf.
1 parent f59be1f commit 11d7eec

File tree

1 file changed

+0
-24
lines changed

1 file changed

+0
-24
lines changed

src/detection/gpu/gpu_linux.c

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -204,15 +204,11 @@ FF_MAYBE_UNUSED static void pciDetectType(FFGPUResult* gpu)
204204

205205
static void pciHandleDevice(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist* results, PCIData* pci, struct pci_dev* device)
206206
{
207-
puts("10");
208207
pci->ffpci_fill_info(device, PCI_FILL_CLASS);
209208

210-
puts("11");
211-
212209
char class[1024];
213210
pci->ffpci_lookup_name(pci->access, class, sizeof(class) - 1, PCI_LOOKUP_CLASS, device->device_class);
214211

215-
puts("12");
216212
if(
217213
//https://pci-ids.ucw.cz/read/PD/03
218214
strcasecmp("VGA compatible controller", class) != 0 &&
@@ -221,25 +217,19 @@ static void pciHandleDevice(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
221217
strcasecmp("Display controller", class) != 0
222218
) return;
223219

224-
puts("13");
225220
pci->ffpci_fill_info(device, PCI_FILL_IDENT);
226221

227222
FFGPUResult* gpu = ffListAdd(results);
228-
puts("14");
229223

230224
ffStrbufInit(&gpu->vendor);
231225
pciDetectVendorName(gpu, pci, device);
232-
puts("15");
233226

234227
ffStrbufInit(&gpu->name);
235228
pciDetectDeviceName(gpu, pci, device);
236-
puts("16");
237229

238230
ffStrbufInit(&gpu->driver);
239231
pciDetectDriverName(gpu, pci, device);
240232

241-
puts("17");
242-
243233
#if FF_USE_PCI_MEMORY
244234
// Libpci reports at least 2 false results (#495, #497)
245235
pciDetectMemory(gpu, pci, device);
@@ -248,14 +238,12 @@ static void pciHandleDevice(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
248238
gpu->dedicated.used = gpu->shared.used = gpu->dedicated.total = gpu->shared.total = FF_GPU_VMEM_SIZE_UNSET;
249239
gpu->type = FF_GPU_TYPE_UNKNOWN;
250240
#endif
251-
puts("18");
252241

253242
gpu->coreCount = FF_GPU_CORE_COUNT_UNSET;
254243
gpu->temperature = FF_GPU_TEMP_UNSET;
255244

256245
if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_NVIDIA && (options->temp || options->useNvml))
257246
{
258-
puts("19");
259247
char pciDeviceId[32];
260248
snprintf(pciDeviceId, sizeof(pciDeviceId) - 1, "%04x:%02x:%02x.%d", device->domain, device->bus, device->dev, device->func);
261249

@@ -265,17 +253,14 @@ static void pciHandleDevice(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
265253
.coreCount = options->useNvml ? (uint32_t*) &gpu->coreCount : NULL,
266254
}, "libnvidia-ml.so");
267255

268-
puts("20");
269256
if (gpu->dedicated.total != FF_GPU_VMEM_SIZE_UNSET)
270257
gpu->type = gpu->dedicated.total > 1024 * 1024 * 1024 ? FF_GPU_TYPE_DISCRETE : FF_GPU_TYPE_INTEGRATED;
271258
}
272259

273-
puts("21");
274260
#ifdef __linux__
275261
if(options->temp && gpu->temperature != gpu->temperature)
276262
pciDetectTemp(gpu, device);
277263
#endif
278-
puts("22");
279264
}
280265

281266
jmp_buf pciInitJmpBuf;
@@ -321,8 +306,6 @@ static const char* pciDetectGPUs(const FFGPUOptions* options, FFlist* gpus)
321306
FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(libpci, pci, pci_get_string_property);
322307
#endif
323308

324-
puts("1");
325-
326309
pci.access = ffpci_alloc();
327310
pci.access->warning = handlePciWarning;
328311
pci.access->error = handlePciInitError;
@@ -332,22 +315,15 @@ static const char* pciDetectGPUs(const FFGPUOptions* options, FFlist* gpus)
332315
return "pcilib: Cannot find any working access method.";
333316
pci.access->error = handlePciGenericError; // set back to generic error so we don't mess up error handling in other places
334317

335-
336-
puts("2");
337-
338318
ffpci_scan_bus(pci.access);
339319

340-
puts("3");
341-
342320
struct pci_dev* device = pci.access->devices;
343321
while(device != NULL)
344322
{
345323
pciHandleDevice(options, gpus, &pci, device);
346324
device = device->next;
347325
}
348326

349-
puts("done");
350-
351327
ffpci_cleanup(pci.access);
352328
return NULL;
353329
}

0 commit comments

Comments
 (0)