Attachment 91533 Details for Bug 68835 – Change heuristic for choosing script offset location for old bioses

[patch] Change heuristic for choosing script offset location for old bioses

0001-drm-nouveau-bios-fix-offset-calculation-for-very-old.patch (text/plain), 1.56 KB, created by Ilia Mirkin on 2014-01-06 07:51:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ilia Mirkin

Created: 2014-01-06 07:51:25 UTC

Size: 1.56 KB

patch

obsolete

>From 326bbc7065bfe3bc1a6ede72b5225d484d2e4d8b Mon Sep 17 00:00:00 2001
>From: Ilia Mirkin <imirkin@alum.mit.edu>
>Date: Mon, 6 Jan 2014 02:12:08 -0500
>Subject: [PATCH] drm/nouveau/bios: fix offset calculation for very old bioses
>
>The only BIOS on record that needs the 14 offset has a bios major
>version 2 but BMP version 1.01. Another bunch of BIOSes that need the 18
>offset have BMP version 2.01 or 5.01 or higher. So instead of looking at the
>bios major version, look at the BMP version. BIOSes with BMP version 0
>do not contain a detectable script, so always return 0 for them.
>
>See https://bugs.freedesktop.org/show_bug.cgi?id=68835
>
>Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
>---
> drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c b/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
>index 9f5b81e..df1b1b4 100644
>--- a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
>+++ b/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
>@@ -365,13 +365,13 @@ static u16
> init_script(struct nouveau_bios *bios, int index)
> {
> 	struct nvbios_init init = { .bios = bios };
>-	u16 data;
>+	u16 bmp_ver = bmp_version(bios), data;
> 
>-	if (bmp_version(bios) && bmp_version(bios) < 0x0510) {
>-		if (index > 1)
>+	if (bmp_ver && bmp_ver < 0x0510) {
>+		if (index > 1 || bmp_ver < 0x0100)
> 			return 0x0000;
> 
>-		data = bios->bmp_offset + (bios->version.major < 2 ? 14 : 18);
>+		data = bios->bmp_offset + (bmp_ver < 0x0200 ? 14 : 18);
> 		return nv_ro16(bios, data + (index * 2));
> 	}
> 
>-- 
>1.8.3.2
>

Actions: View | Splinter Review

Attachments on bug 68835: 85048 | 85049 | 85050 | 85078 | 91533 | 92960

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.