iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/nouveau: display error message for any failed init table opcode

Browse Source 
Some handlers don't report specific errors, but we still *really* want to
know if we failed to parse a complete init table.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2010-05-10 16:59:42 +10:00
parent 9170a82438
commit 92b9618761
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/gpu/drm/nouveau/nouveau_bios.c
View File

@ -3130,7 +3130,7 @@ parse_init_table(struct nvbios *bios, unsigned int offset,
* is changed back to EXECUTE. * is changed back to EXECUTE.
*/ */
int count = 0, i, res; int count = 0, i, ret;
uint8_t id; uint8_t id;
/* /*
@ -3145,26 +3145,33 @@ parse_init_table(struct nvbios *bios, unsigned int offset,
for (i = 0; itbl_entry[i].name && (itbl_entry[i].id != id); i++) for (i = 0; itbl_entry[i].name && (itbl_entry[i].id != id); i++)
; ;
if (itbl_entry[i].name) { if (!itbl_entry[i].name) {
BIOSLOG(bios, "0x%04X: [ (0x%02X) - %s ]\n",
offset, itbl_entry[i].id, itbl_entry[i].name);
/* execute eventual command handler */
res = (*itbl_entry[i].handler)(bios, offset, iexec);
if (!res)
break;
/*
* Add the offset of the current command including all data
* of that command. The offset will then be pointing on the
* next op code.
*/
offset += res;
} else {
NV_ERROR(bios->dev, NV_ERROR(bios->dev,
"0x%04X: Init table command not found: " "0x%04X: Init table command not found: "
"0x%02X\n", offset, id); "0x%02X\n", offset, id);
return -ENOENT; return -ENOENT;
} }
BIOSLOG(bios, "0x%04X: [ (0x%02X) - %s ]\n", offset,
itbl_entry[i].id, itbl_entry[i].name);
/* execute eventual command handler */
ret = (*itbl_entry[i].handler)(bios, offset, iexec);
if (ret < 0) {
NV_ERROR(bios->dev, "0x%04X: Failed parsing init "
"table opcode: %s %d\n", offset,
itbl_entry[i].name, ret);
}
if (ret <= 0)
break;
/*
* Add the offset of the current command including all data
* of that command. The offset will then be pointing on the
* next op code.
*/
offset += ret;
} }
if (offset >= bios->length) if (offset >= bios->length)