flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-11-04 12:07:12 +00:00
Code Issues Releases Wiki Activity

lib: Make instdone initialisation fail gracefully

Browse Source 
Just report that we don't recognise the chipset rather than explode.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2015-11-09 08:58:59 +00:00
parent 134e32378a
commit 70ee508421
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/instdone.c
View File

@ -423,7 +423,7 @@ init_gen9_instdone(void)
init_gen8_instdone(); init_gen8_instdone();
} }
void bool
init_instdone_definitions(uint32_t devid) init_instdone_definitions(uint32_t devid)
{ {
if (IS_GEN9(devid)) { if (IS_GEN9(devid)) {
@ -595,8 +595,7 @@ init_instdone_definitions(uint32_t devid)
gen3_instdone_bit(CC_DONE, "Color calculator"); gen3_instdone_bit(CC_DONE, "Color calculator");
gen3_instdone_bit(MAP_FILTER_DONE, "Map filter"); gen3_instdone_bit(MAP_FILTER_DONE, "Map filter");
gen3_instdone_bit(MAP_L2_IDLE, "Map L2"); gen3_instdone_bit(MAP_L2_IDLE, "Map L2");
} else { } else if (IS_GEN2(devid)) {
igt_assert(IS_GEN2(devid));
gen3_instdone_bit(I830_GMBUS_DONE, "GMBUS"); gen3_instdone_bit(I830_GMBUS_DONE, "GMBUS");
gen3_instdone_bit(I830_FBC_DONE, "FBC"); gen3_instdone_bit(I830_FBC_DONE, "FBC");
gen3_instdone_bit(I830_BINNER_DONE, "BINNER"); gen3_instdone_bit(I830_BINNER_DONE, "BINNER");
@ -624,5 +623,8 @@ init_instdone_definitions(uint32_t devid)
gen3_instdone_bit(I830_SECONDARY_RING_0_DONE, "Secondary ring 0"); gen3_instdone_bit(I830_SECONDARY_RING_0_DONE, "Secondary ring 0");
gen3_instdone_bit(I830_PRIMARY_RING_1_DONE, "Primary ring 1"); gen3_instdone_bit(I830_PRIMARY_RING_1_DONE, "Primary ring 1");
gen3_instdone_bit(I830_PRIMARY_RING_0_DONE, "Primary ring 0"); gen3_instdone_bit(I830_PRIMARY_RING_0_DONE, "Primary ring 0");
} } else
return false;
return true;
} }

2
lib/instdone.h
View File

@ -38,4 +38,4 @@ struct instdone_bit {
extern struct instdone_bit instdone_bits[MAX_INSTDONE_BITS]; extern struct instdone_bit instdone_bits[MAX_INSTDONE_BITS];
extern int num_instdone_bits; extern int num_instdone_bits;
void init_instdone_definitions(uint32_t devid); bool init_instdone_definitions(uint32_t devid);

3
tools/intel_error_decode.c
View File

@ -97,7 +97,8 @@ print_instdone(uint32_t devid, unsigned int instdone, unsigned int instdone1)
static int once; static int once;
if (!once) { if (!once) {
init_instdone_definitions(devid); if (!init_instdone_definitions(devid))
return;
once = 1; once = 1;
} }