From 07dde33a4f51941b4f612823ea6ea7ca01a6efbc Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 21 Dec 2012 14:35:32 +0000 Subject: [PATCH] sna: Remove a pair of stale assertions For gen2-5, it does not matter what mode the batch is in when we insert the scanline wait. With the more aggressive batch flushing, and relaxed assigned of mode for those generations, we are likely to see that the batch is idle when we go to insert the waits. Signed-off-by: Chris Wilson --- src/sna/sna_display.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index c150078c..0736cfa3 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -2823,8 +2823,6 @@ static bool sna_emit_wait_for_scanline_gen4(struct sna *sna, uint32_t event; uint32_t *b; - assert(sna->kgem.mode != KGEM_NONE); - if (pipe == 0) { if (full_height) event = MI_WAIT_FOR_PIPEA_SVBLANK; @@ -2854,8 +2852,6 @@ static bool sna_emit_wait_for_scanline_gen2(struct sna *sna, { uint32_t *b; - assert(sna->kgem.mode != KGEM_NONE); - /* * Pre-965 doesn't have SVBLANK, so we need a bit * of extra time for the blitter to start up and