summaryrefslogtreecommitdiff
path: root/src/sna/sna_driver.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2015-03-05 08:39:31 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2015-03-05 08:55:04 +0000
commit7ae299be60ef3ab4f8cc49edd9d5a14d826d5583 (patch)
treebc296b4b88762670ad678b1cbdbed6d4e658aa9a /src/sna/sna_driver.c
parentdb82617464e55432522e6199a88408ff0187f6ff (diff)
sna: Remove the flush after waking up between clients
In the normal command processing stream, we will have lots of opportunity to ask whether we should be batching requests together. If we wakeup without doing any work, then we will check inside the block handler whether the GPU is idle and flush then. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_driver.c')
-rw-r--r--src/sna/sna_driver.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index bc20ef02..ab9ce04e 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -708,7 +708,7 @@ sna_block_handler(BLOCKHANDLER_ARGS_DECL)
sna->BlockHandler(BLOCKHANDLER_ARGS);
if (*tv == NULL || ((*tv)->tv_usec | (*tv)->tv_sec) || has_shadow(sna))
- sna_accel_block_handler(sna, tv);
+ sna_accel_block(sna, tv);
}
static void
@@ -730,8 +730,6 @@ sna_wakeup_handler(WAKEUPHANDLER_ARGS_DECL)
sna->WakeupHandler(WAKEUPHANDLER_ARGS);
- sna_accel_wakeup_handler(sna);
-
if (FD_ISSET(sna->kgem.fd, (fd_set*)read_mask)) {
sna_mode_wakeup(sna);
/* Clear the flag so that subsequent ZaphodHeads don't block */