diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2014-01-05 20:07:02 -0500 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-01-07 13:37:55 +1000 |
| commit | 6d60792ec059d9f2139828f9f017679abb81aa73 (patch) | |
| tree | 7044f0263c615c2ee06fd7f560c3aa19ab325218 | |
| parent | 6e9cbb40d2be7e0693d6b1b0e2790277a366c471 (diff) | |
| download | kernel-common-6d60792ec059d9f2139828f9f017679abb81aa73.tar.gz kernel-common-6d60792ec059d9f2139828f9f017679abb81aa73.tar.bz2 kernel-common-6d60792ec059d9f2139828f9f017679abb81aa73.zip | |
drm/nouveau/bios: make jump conditional
This fixes a hang in VBIOS scripts of the form "condition; 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
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c b/drivers/gpu/drm/nouveau/core/subdev/bios/init.c index 420908cb82b6..9f5b81e99731 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c +++ b/drivers/gpu/drm/nouveau/core/subdev/bios/init.c @@ -1294,7 +1294,11 @@ 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; } /** |