diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2015-11-09 08:58:59 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2015-11-09 16:57:22 +0000 |
| commit | 70ee5084213c27733f723a7d3f597764bba38dcf (patch) | |
| tree | 3e5a1cff4f22b657c401cbd7986fb475ef291a88 /lib/instdone.c | |
| parent | 134e32378a242e846a6e553ad80317a4a56b13b9 (diff) | |
lib: Make instdone initialisation fail gracefully
Just report that we don't recognise the chipset rather than explode.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'lib/instdone.c')
| -rw-r--r-- | lib/instdone.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/instdone.c b/lib/instdone.c index fffb9491..53d82154 100644 --- a/lib/instdone.c +++ b/lib/instdone.c @@ -423,7 +423,7 @@ init_gen9_instdone(void) init_gen8_instdone(); } -void +bool init_instdone_definitions(uint32_t 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(MAP_FILTER_DONE, "Map filter"); gen3_instdone_bit(MAP_L2_IDLE, "Map L2"); - } else { - igt_assert(IS_GEN2(devid)); + } else if (IS_GEN2(devid)) { gen3_instdone_bit(I830_GMBUS_DONE, "GMBUS"); gen3_instdone_bit(I830_FBC_DONE, "FBC"); 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_PRIMARY_RING_1_DONE, "Primary ring 1"); gen3_instdone_bit(I830_PRIMARY_RING_0_DONE, "Primary ring 0"); - } + } else + return false; + + return true; } |