sna/present: Integrate into TearFree, take 2

Following on from the previous attempt is the realisation that we can
simply disable TearFree during a Present flip queue, and re-enable
TearFree upon unflip.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

1 files changed, 1 insertions, 7 deletions

diff --git a/src/sna/sna.h b/src/sna/sna.h
index 1bddf7ad..bbcea080 100644
--- a/src/sna/sna.h
+++ b/src/sna/sna.h
@@ -311,13 +311,6 @@ struct sna {
 		Bool (*rrGetInfo)(ScreenPtr, Rotation *);
 	} mode;
 
-	struct sna_tearfree {
-		struct notifier {
-			void (*func)(struct sna *, void *);
-			void *data;
-		} hook[2];
-	} tearfree;
-
 	struct {
 		struct sna_cursor *cursors;
 		xf86CursorInfoPtr info;
@@ -363,6 +356,7 @@ struct sna {
 		bool open;
 #if HAVE_PRESENT
 		uint64_t unflip;
+		void *tearfree;
 #endif
 	} present;