diff options
| author | David Lamparter <equinox@diac24.net> | 2012-08-16 15:45:20 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2012-08-20 11:09:50 -0400 |
| commit | 268ba0a99f89a84dc5eb312470896113d0709c74 (patch) | |
| tree | e1afc177238ed23ed3ffa3b2ad0d6dcd65349c95 | |
| parent | 52e9b39d9a89ae33662596bd30e62dd56bddbe73 (diff) | |
drm/radeon: implement ACPI VFCT vbios fetch (v3)
This is required for pure UEFI systems. The vbios is stored
in ACPI rather than at the legacy vga location.
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=26891
V2: fix #ifdefs as per Greg's comments
V3: fix it harder
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Cc: stable@vger.kernel.org
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_bios.c | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c index 501f4881e5aa..a32232fc7bd3 100644 --- a/drivers/gpu/drm/radeon/radeon_bios.c +++ b/drivers/gpu/drm/radeon/radeon_bios.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | #include <linux/vga_switcheroo.h> | 33 | #include <linux/vga_switcheroo.h> |
| 34 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
| 35 | #include <linux/acpi.h> | ||
| 35 | /* | 36 | /* |
| 36 | * BIOS. | 37 | * BIOS. |
| 37 | */ | 38 | */ |
| @@ -476,6 +477,63 @@ static bool radeon_read_disabled_bios(struct radeon_device *rdev) | |||
| 476 | return legacy_read_disabled_bios(rdev); | 477 | return legacy_read_disabled_bios(rdev); |
| 477 | } | 478 | } |
| 478 | 479 | ||
| 480 | #ifdef CONFIG_ACPI | ||
| 481 | static bool radeon_acpi_vfct_bios(struct radeon_device *rdev) | ||
| 482 | { | ||
| 483 | bool ret = false; | ||
| 484 | struct acpi_table_header *hdr; | ||
| 485 | /* acpi_get_table_with_size is not exported :( */ | ||
| 486 | acpi_size tbl_size = 0x7fffffff; | ||
| 487 | UEFI_ACPI_VFCT *vfct; | ||
| 488 | GOP_VBIOS_CONTENT *vbios; | ||
| 489 | VFCT_IMAGE_HEADER *vhdr; | ||
| 490 | |||
| 491 | if (!ACPI_SUCCESS(acpi_get_table("VFCT", 1, &hdr))) | ||
| 492 | return false; | ||
| 493 | if (tbl_size < sizeof(UEFI_ACPI_VFCT)) { | ||
| 494 | DRM_ERROR("ACPI VFCT table present but broken (too short #1)\n"); | ||
| 495 | goto out_unmap; | ||
| 496 | } | ||
| 497 | |||
| 498 | vfct = (UEFI_ACPI_VFCT *)hdr; | ||
| 499 | if (vfct->VBIOSImageOffset + sizeof(VFCT_IMAGE_HEADER) > tbl_size) { | ||
| 500 | DRM_ERROR("ACPI VFCT table present but broken (too short #2)\n"); | ||
| 501 | goto out_unmap; | ||
| 502 | } | ||
| 503 | |||
| 504 | vbios = (GOP_VBIOS_CONTENT *)((char *)hdr + vfct->VBIOSImageOffset); | ||
| 505 | vhdr = &vbios->VbiosHeader; | ||
| 506 | DRM_INFO("ACPI VFCT contains a BIOS for %02x:%02x.%d %04x:%04x, size %d\n", | ||
| 507 | vhdr->PCIBus, vhdr->PCIDevice, vhdr->PCIFunction, | ||
| 508 | vhdr->VendorID, vhdr->DeviceID, vhdr->ImageLength); | ||
| 509 | |||
| 510 | if (vhdr->PCIBus != rdev->pdev->bus->number || | ||
| 511 | vhdr->PCIDevice != PCI_SLOT(rdev->pdev->devfn) || | ||
| 512 | vhdr->PCIFunction != PCI_FUNC(rdev->pdev->devfn) || | ||
| 513 | vhdr->VendorID != rdev->pdev->vendor || | ||
| 514 | vhdr->DeviceID != rdev->pdev->device) { | ||
| 515 | DRM_INFO("ACPI VFCT table is not for this card\n"); | ||
| 516 | goto out_unmap; | ||
| 517 | }; | ||
| 518 | |||
| 519 | if (vfct->VBIOSImageOffset + sizeof(VFCT_IMAGE_HEADER) + vhdr->ImageLength > tbl_size) { | ||
| 520 | DRM_ERROR("ACPI VFCT image truncated\n"); | ||
| 521 | goto out_unmap; | ||
| 522 | } | ||
| 523 | |||
| 524 | rdev->bios = kmemdup(&vbios->VbiosContent, vhdr->ImageLength, GFP_KERNEL); | ||
| 525 | ret = !!rdev->bios; | ||
| 526 | |||
| 527 | out_unmap: | ||
| 528 | /* uh, no idea what to do here... */ | ||
| 529 | return ret; | ||
| 530 | } | ||
| 531 | #else | ||
| 532 | static inline bool radeon_acpi_vfct_bios(struct radeon_device *rdev) | ||
| 533 | { | ||
| 534 | return false; | ||
| 535 | } | ||
| 536 | #endif | ||
| 479 | 537 | ||
| 480 | bool radeon_get_bios(struct radeon_device *rdev) | 538 | bool radeon_get_bios(struct radeon_device *rdev) |
| 481 | { | 539 | { |
| @@ -484,6 +542,8 @@ bool radeon_get_bios(struct radeon_device *rdev) | |||
| 484 | 542 | ||
| 485 | r = radeon_atrm_get_bios(rdev); | 543 | r = radeon_atrm_get_bios(rdev); |
| 486 | if (r == false) | 544 | if (r == false) |
| 545 | r = radeon_acpi_vfct_bios(rdev); | ||
| 546 | if (r == false) | ||
| 487 | r = igp_read_bios_from_vram(rdev); | 547 | r = igp_read_bios_from_vram(rdev); |
| 488 | if (r == false) | 548 | if (r == false) |
| 489 | r = radeon_read_bios(rdev); | 549 | r = radeon_read_bios(rdev); |
