Attachment 65100 Details for Bug 26891 – hacked-up radeon VFCT BIOS access patch

[patch] hacked-up radeon VFCT BIOS access patch

radeonvfct.patch (text/plain), 2.38 KB, created by David L. on 2012-08-03 18:49:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David L.

Created: 2012-08-03 18:49:14 UTC

Size: 2.38 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c
>index 501f488..7d4f6cb 100644
>--- a/drivers/gpu/drm/radeon/radeon_bios.c
>+++ b/drivers/gpu/drm/radeon/radeon_bios.c
>@@ -32,6 +32,7 @@
> 
> #include <linux/vga_switcheroo.h>
> #include <linux/slab.h>
>+#include <linux/acpi.h>
> /*
>  * BIOS.
>  */
>@@ -476,6 +477,56 @@ static bool radeon_read_disabled_bios(struct radeon_device *rdev)
> 		return legacy_read_disabled_bios(rdev);
> }
> 
>+static bool radeon_acpi_vfct_bios(struct radeon_device *rdev)
>+{
>+	bool ret = false;
>+	struct acpi_table_header *hdr;
>+	/* acpi_get_table_with_size is not exported :( */
>+	acpi_size tbl_size = 0x7fffffff;
>+	UEFI_ACPI_VFCT *vfct;
>+	GOP_VBIOS_CONTENT *vbios;
>+	VFCT_IMAGE_HEADER *vhdr;
>+
>+	if (!ACPI_SUCCESS(acpi_get_table("VFCT", 1, &hdr)))
>+		return false;
>+	if (tbl_size < sizeof(UEFI_ACPI_VFCT)) {
>+		DRM_ERROR("ACPI VFCT table present but broken (too short #1)\n");
>+		goto out_unmap;
>+	}
>+
>+	vfct = (UEFI_ACPI_VFCT *)hdr;
>+	if (vfct->VBIOSImageOffset + sizeof(VFCT_IMAGE_HEADER) > tbl_size) {
>+		DRM_ERROR("ACPI VFCT table present but broken (too short #2)\n");
>+		goto out_unmap;
>+	}
>+
>+	vbios = (GOP_VBIOS_CONTENT *)((char *)hdr + vfct->VBIOSImageOffset);
>+	vhdr = &vbios->VbiosHeader;
>+	DRM_INFO("ACPI VFCT contains a BIOS for %02x:%02x.%d %04x:%04x, size %d\n",
>+			vhdr->PCIBus, vhdr->PCIDevice, vhdr->PCIFunction,
>+			vhdr->VendorID, vhdr->DeviceID, vhdr->ImageLength);
>+
>+	if (vhdr->PCIBus != rdev->pdev->bus->number
>+			|| vhdr->PCIDevice != PCI_SLOT(rdev->pdev->devfn)
>+			|| vhdr->PCIFunction != PCI_FUNC(rdev->pdev->devfn)
>+			|| vhdr->VendorID != rdev->pdev->vendor
>+			|| vhdr->DeviceID != rdev->pdev->device) {
>+		DRM_INFO("ACPI VFCT table is not for this card\n");
>+		goto out_unmap;
>+	};
>+
>+	if (vfct->VBIOSImageOffset + sizeof(VFCT_IMAGE_HEADER) + vhdr->ImageLength > tbl_size) {
>+		DRM_ERROR("ACPI VFCT image truncated\n");
>+		goto out_unmap;
>+	}
>+
>+	rdev->bios = kmemdup(&vbios->VbiosContent, vhdr->ImageLength, GFP_KERNEL);
>+	ret = !!rdev->bios;
>+
>+out_unmap:
>+	/* uh, no idea what to do here... */
>+	return ret;
>+}
> 
> bool radeon_get_bios(struct radeon_device *rdev)
> {
>@@ -487,6 +538,8 @@ bool radeon_get_bios(struct radeon_device *rdev)
> 		r = igp_read_bios_from_vram(rdev);
> 	if (r == false)
> 		r = radeon_read_bios(rdev);
>+	if (r == false)
>+		r = radeon_acpi_vfct_bios(rdev);
> 	if (r == false) {
> 		r = radeon_read_disabled_bios(rdev);
> 	}

Actions: View | Splinter Review

Attachments on bug 26891: 33766 | 56618 | 56619 | 56620 | 65100 | 65357 | 66308 | 67258 | 67314

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.