summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-12-21 14:35:32 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2012-12-21 14:35:32 +0000
commit07dde33a4f51941b4f612823ea6ea7ca01a6efbc (patch)
treee7082aea62bb2057e50c8cac91c906fac9408f50
parentbdd0cca4e1192df0038621925c4e6243ba419a81 (diff)
downloadxf86-video-intel-07dde33a4f51941b4f612823ea6ea7ca01a6efbc.tar.gz
xf86-video-intel-07dde33a4f51941b4f612823ea6ea7ca01a6efbc.tar.bz2
xf86-video-intel-07dde33a4f51941b4f612823ea6ea7ca01a6efbc.zip
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 <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_display.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index c150078c6..0736cfa3a 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