All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/5] instdone: Fix fallthroughs to invalid instdone bits on newer hardware.
@ 2012-02-20 18:03 Eric Anholt
  2012-02-20 18:03 ` [PATCH 2/5] instdone: Add support for one of the IVB instdone regs Eric Anholt
                   ` (3 more replies)
  0 siblings, 4 replies; 10+ messages in thread
From: Eric Anholt @ 2012-02-20 18:03 UTC (permalink / raw)
  To: intel-gfx

---
 lib/instdone.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/lib/instdone.c b/lib/instdone.c
index 3e4d895..e12982c 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");
-- 
1.7.9

^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2012-02-22  9:52 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-20 18:03 [PATCH 1/5] instdone: Fix fallthroughs to invalid instdone bits on newer hardware Eric Anholt
2012-02-20 18:03 ` [PATCH 2/5] instdone: Add support for one of the IVB instdone regs Eric Anholt
2012-02-20 18:04 ` [PATCH 3/5] reg_dumper: Refactor duplicated reg-dumping code Eric Anholt
2012-02-20 18:04 ` [PATCH 4/5] intel_reg_dumper: Add dumping of GPU turbo regs Eric Anholt
2012-02-20 22:53   ` Paul Menzel
2012-02-21 18:50     ` Eric Anholt
2012-02-20 18:04 ` [PATCH 5/5] gem_ringfill: Make this actually test that all the batches executed Eric Anholt
2012-02-20 21:22   ` Chris Wilson
2012-02-20 22:05   ` Chris Wilson
2012-02-22  9:53   ` Daniel Vetter

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.