diff options
| author | Eric Anholt <eric@anholt.net> | 2012-02-20 10:03:58 -0800 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-02-22 10:43:19 +0100 |
| commit | 3e0bd266d29c74fb4e5d19d24e8c9853c0da90eb (patch) | |
| tree | c9b80b629fad62768551ad30cd5512fbebde45be /lib/instdone.c | |
| parent | 4fc909fd4881eec38d46be5db9e023e07d53c33c (diff) | |
instdone: Fix fallthroughs to invalid instdone bits on newer hardware.
Diffstat (limited to 'lib/instdone.c')
| -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 817fb9c0..4679a9c1 100644 --- a/lib/instdone.c +++ b/lib/instdone.c @@ -25,6 +25,7 @@ * */ +#include <assert.h> #include "instdone.h" #include "intel_chipset.h" @@ -263,7 +264,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"); @@ -325,6 +326,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"); |