Attachment 91531 Details for Bug 72943 – make jump execution conditional

[patch] make jump execution conditional

0001-drm-nouveau-bios-make-jump-conditional.patch (text/plain), 1.28 KB, created by Ilia Mirkin on 2014-01-06 00:58:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ilia Mirkin

Created: 2014-01-06 00:58:22 UTC

Size: 1.28 KB

patch

obsolete

>From 8a194bbd6b268653e5b8ac270ffa0b40be03c421 Mon Sep 17 00:00:00 2001
>From: Ilia Mirkin <imirkin@alum.mit.edu>
>Date: Sun, 5 Jan 2014 19:52:44 -0500
>Subject: [PATCH] drm/nouveau/bios: make jump conditional
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This fixes a hang in VBIOS scripts of the form "condition; nv_reg;
>jump". The jump used to always be executed, while now it will only be
>executed if the condition is true.
>
>See https://bugs.freedesktop.org/show_bug.cgi?id=72943
>
>Reported-by: Darcy BrÃ¡s da Silva <dardevelin@cidadecool.com>
>Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c b/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
>index 420908c..0539d18 100644
>--- a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
>+++ b/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
>@@ -1294,7 +1294,12 @@ init_jump(struct nvbios_init *init)
> 	u16 offset = nv_ro16(bios, init->offset + 1);
> 
> 	trace("JUMP\t0x%04x\n", offset);
>-	init->offset = offset;
>+
>+	if (init_exec(init)) {
>+		init->offset = offset;
>+	} else {
>+		init->offset += 3;
>+	}
> }
> 
> /**
>-- 
>1.8.3.2
>

Actions: View | Splinter Review

Attachments on bug 72943: 91069 | 91070 | 91141 | 91182 | 91531 | 91612

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.