redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/nouveau/bios/devinit: properly handle unknown generic conditions

Browse source 
Upon encountering an unknown condition code, the script interpreter
is supposed to skip 'size' bytes and continue at the next devinit
token.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2016-02-18 04:10:04 +10:00
parent 989f578473
commit e24c9c44d7
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
View file

@ -795,11 +795,11 @@ init_generic_condition(struct nvbios_init *init)
struct nvkm_bios *bios = init->bios;
struct nvbios_dpout info;
u8 cond = nvbios_rd08(bios, init->offset + 1);
u8 unkn = nvbios_rd08(bios, init->offset + 2);
u8 size = nvbios_rd08(bios, init->offset + 2);
u8 ver, hdr, cnt, len;
u16 data;
trace("GENERIC_CONDITION\t0x%02x 0x%02x\n", cond, unkn);
trace("GENERIC_CONDITION\t0x%02x 0x%02x\n", cond, size);
init->offset += 3;
switch (cond) {
@ -829,6 +829,7 @@ init_generic_condition(struct nvbios_init *init)
break;
default:
warn("INIT_GENERIC_CONDITON: unknown 0x%02x\n", cond);
init->offset += size;
break;
}
}