From: Greg Kroah-Hartman Date: Sun, 21 Oct 2012 16:31:51 +0000 (-0700) Subject: delete queue-3.6/drm-nouveau-bios-fix-shadowing-of-acpi-roms-larger-than-64kib.patch X-Git-Tag: v3.6.3~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f40187e10a305072721ff3be6c92c540583d6818;p=thirdparty%2Fkernel%2Fstable-queue.git delete queue-3.6/drm-nouveau-bios-fix-shadowing-of-acpi-roms-larger-than-64kib.patch --- diff --git a/queue-3.6/drm-nouveau-bios-fix-shadowing-of-acpi-roms-larger-than-64kib.patch b/queue-3.6/drm-nouveau-bios-fix-shadowing-of-acpi-roms-larger-than-64kib.patch deleted file mode 100644 index 349fe8d25a2..00000000000 --- a/queue-3.6/drm-nouveau-bios-fix-shadowing-of-acpi-roms-larger-than-64kib.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9a334cd0de2f43b29c192548000692bad52edfc6 Mon Sep 17 00:00:00 2001 -From: Ben Skeggs -Date: Tue, 9 Oct 2012 12:21:36 +1000 -Subject: drm/nouveau/bios: fix shadowing of ACPI ROMs larger than 64KiB - -From: Ben Skeggs - -commit 9a334cd0de2f43b29c192548000692bad52edfc6 upstream. - -Signed-off-by: Ben Skeggs -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/nouveau/nouveau_bios.c | 22 ++++++++++------------ - 1 file changed, 10 insertions(+), 12 deletions(-) - ---- a/drivers/gpu/drm/nouveau/nouveau_bios.c -+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c -@@ -196,24 +196,22 @@ static void - bios_shadow_acpi(struct nvbios *bios) - { - struct pci_dev *pdev = bios->dev->pdev; -- int cnt = 65536 / ROM_BIOS_PAGE; -- int ret; -+ int ret, cnt, i; -+ u8 data[3]; - - if (!nouveau_acpi_rom_supported(pdev)) - return; - -- bios->data = kmalloc(cnt * ROM_BIOS_PAGE, GFP_KERNEL); -- if (!bios->data) -- return; -- - bios->length = 0; -- while (cnt--) { -- ret = nouveau_acpi_get_bios_chunk(bios->data, bios->length, -- ROM_BIOS_PAGE); -- if (ret != ROM_BIOS_PAGE) -- return; -+ if (nouveau_acpi_get_bios_chunk(data, 0, 3) == 3) -+ bios->length = data[2] * 512; - -- bios->length += ROM_BIOS_PAGE; -+ bios->data = kmalloc(bios->length, GFP_KERNEL); -+ for (i = 0; bios->data && i < bios->length; i += cnt) { -+ cnt = min((bios->length - i), (u32)4096); -+ ret = nouveau_acpi_get_bios_chunk(bios->data, i, cnt); -+ if (ret != cnt) -+ break; - } - } - diff --git a/queue-3.6/series b/queue-3.6/series index 79132c081af..e07094975dc 100644 --- a/queue-3.6/series +++ b/queue-3.6/series @@ -57,7 +57,6 @@ fs-prevent-use-after-free-in-auditing-when-symlink-following-was-denied.patch drm-radeon-don-t-destroy-i2c-bus-rec-in-radeon_ext_tmds_enc_destroy.patch drm-i915-remove-useless-bug_on-which-caused-a-regression-in-3.5.patch drm-i915-set-guardband-clipping-workaround-bit-in-the-right-register.patch -drm-nouveau-bios-fix-shadowing-of-acpi-roms-larger-than-64kib.patch drm-i915-use-adjusted_mode-instead-of-mode-for-checking-the-6bpc-force-flag.patch mcs7830-fix-link-state-detection.patch jbd-fix-assertion-failure-in-commit-code-due-to-lacking-transaction-credits.patch