diff options
| author | Eric Anholt <eric@anholt.net> | 2012-01-18 12:07:16 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-02-20 09:56:40 -0800 |
| commit | 7939321653c3fd5539c49249fe5ae7771b1a0997 (patch) | |
| tree | d80c29eac93cf4fd03ff98b1ec0d3bf1f18782e7 | |
| parent | 8bedcae848332e9dd3425765682a7f71eb1339f0 (diff) | |
instdone: Fix fallthroughs to invalid instdone bits on newer hardware.
| -rw-r--r-- | lib/instdone.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/instdone.c b/lib/instdone.c index 3e4d8957..e12982c4 100644 --- a/lib/instdone.c +++ b/lib/instdone.c @@ -25,6 +25,7 @@ * */ +#include <assert.h> #include "instdone.h" #include "intel_chipset.h" @@ -239,7 +240,7 @@ init_instdone_definitions(uint32_t devid) gen4_instdone_bit(ILK_AM_DONE, "AM"); init_g4x_instdone1(); - } else if (IS_965(devid)) { + } else if (IS_GEN4(devid)) { gen4_instdone_bit(I965_ROW_0_EU_0_DONE, "Row 0, EU 0"); gen4_instdone_bit(I965_ROW_0_EU_1_DONE, "Row 0, EU 1"); gen4_instdone_bit(I965_ROW_0_EU_2_DONE, "Row 0, EU 2"); @@ -301,6 +302,7 @@ init_instdone_definitions(uint32_t devid) gen3_instdone_bit(MAP_FILTER_DONE, "Map filter"); gen3_instdone_bit(MAP_L2_IDLE, "Map L2"); } else { + assert(IS_GEN2(devid)); gen3_instdone_bit(I830_GMBUS_DONE, "GMBUS"); gen3_instdone_bit(I830_FBC_DONE, "FBC"); gen3_instdone_bit(I830_BINNER_DONE, "BINNER"); |