From c6c4f30e194eb3b8a2421134bb005f1542b3ef9f Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 29 Jun 2012 10:14:52 +0100 Subject: [PATCH] sna: Add assertions to check that we do install the timers Signed-off-by: Chris Wilson --- src/sna/sna_accel.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index b5e7e920..86e22ec9 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -12812,12 +12812,21 @@ void sna_accel_block_handler(struct sna *sna, struct timeval **tv) if (sna_accel_do_flush(sna)) sna_accel_flush(sna); + assert(sna->flags & SNA_NO_DELAYED_FLUSH || + sna_accel_scanout(sna) == NULL || + sna_accel_scanout(sna)->gpu_bo->exec == NULL || + sna->timer_active & (1<<(FLUSH_TIMER))); if (sna_accel_do_throttle(sna)) sna_accel_throttle(sna); + assert(sna->flags & SNA_NO_THROTTLE || + !sna->kgem.need_retire || + sna->timer_active & (1<<(THROTTLE_TIMER))); if (sna_accel_do_expire(sna)) sna_accel_expire(sna); + assert(!sna->kgem.need_expire || + sna->timer_active & (1<<(EXPIRE_TIMER))); if (sna_accel_do_inactive(sna)) sna_accel_inactive(sna);