.. | .. |
---|
25 | 25 | * Alex Deucher |
---|
26 | 26 | * Jerome Glisse |
---|
27 | 27 | */ |
---|
28 | | -#include <drm/drmP.h> |
---|
| 28 | + |
---|
29 | 29 | #include "amdgpu.h" |
---|
30 | 30 | #include "atom.h" |
---|
31 | 31 | |
---|
| 32 | +#include <linux/pci.h> |
---|
32 | 33 | #include <linux/slab.h> |
---|
33 | 34 | #include <linux/acpi.h> |
---|
34 | 35 | /* |
---|
.. | .. |
---|
312 | 313 | |
---|
313 | 314 | if (!found) |
---|
314 | 315 | return false; |
---|
| 316 | + pci_dev_put(pdev); |
---|
315 | 317 | |
---|
316 | 318 | adev->bios = kmalloc(size, GFP_KERNEL); |
---|
317 | 319 | if (!adev->bios) { |
---|
.. | .. |
---|
416 | 418 | |
---|
417 | 419 | bool amdgpu_get_bios(struct amdgpu_device *adev) |
---|
418 | 420 | { |
---|
419 | | - if (amdgpu_atrm_get_bios(adev)) |
---|
| 421 | + if (amdgpu_atrm_get_bios(adev)) { |
---|
| 422 | + dev_info(adev->dev, "Fetched VBIOS from ATRM\n"); |
---|
420 | 423 | goto success; |
---|
| 424 | + } |
---|
421 | 425 | |
---|
422 | | - if (amdgpu_acpi_vfct_bios(adev)) |
---|
| 426 | + if (amdgpu_acpi_vfct_bios(adev)) { |
---|
| 427 | + dev_info(adev->dev, "Fetched VBIOS from VFCT\n"); |
---|
423 | 428 | goto success; |
---|
| 429 | + } |
---|
424 | 430 | |
---|
425 | | - if (igp_read_bios_from_vram(adev)) |
---|
| 431 | + if (igp_read_bios_from_vram(adev)) { |
---|
| 432 | + dev_info(adev->dev, "Fetched VBIOS from VRAM BAR\n"); |
---|
426 | 433 | goto success; |
---|
| 434 | + } |
---|
427 | 435 | |
---|
428 | | - if (amdgpu_read_bios(adev)) |
---|
| 436 | + if (amdgpu_read_bios(adev)) { |
---|
| 437 | + dev_info(adev->dev, "Fetched VBIOS from ROM BAR\n"); |
---|
429 | 438 | goto success; |
---|
| 439 | + } |
---|
430 | 440 | |
---|
431 | | - if (amdgpu_read_bios_from_rom(adev)) |
---|
| 441 | + if (amdgpu_read_bios_from_rom(adev)) { |
---|
| 442 | + dev_info(adev->dev, "Fetched VBIOS from ROM\n"); |
---|
432 | 443 | goto success; |
---|
| 444 | + } |
---|
433 | 445 | |
---|
434 | | - if (amdgpu_read_disabled_bios(adev)) |
---|
| 446 | + if (amdgpu_read_disabled_bios(adev)) { |
---|
| 447 | + dev_info(adev->dev, "Fetched VBIOS from disabled ROM BAR\n"); |
---|
435 | 448 | goto success; |
---|
| 449 | + } |
---|
436 | 450 | |
---|
437 | | - if (amdgpu_read_platform_bios(adev)) |
---|
| 451 | + if (amdgpu_read_platform_bios(adev)) { |
---|
| 452 | + dev_info(adev->dev, "Fetched VBIOS from platform\n"); |
---|
438 | 453 | goto success; |
---|
| 454 | + } |
---|
439 | 455 | |
---|
440 | 456 | DRM_ERROR("Unable to locate a BIOS ROM\n"); |
---|
441 | 457 | return false; |
---|