i830: Remove vestigal debugging ALWAYS_FLUSH and ALWAYS_SYNC

These are now debugging options exposed in Xorg.conf, and now unused int
the source code.

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

4 files changed, 0 insertions, 24 deletions

diff --git a/src/i830.h b/src/i830.h
index 827655b3..2c875f33 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -189,9 +189,6 @@ typedef struct _I830OutputRec I830OutputRec, *I830OutputPtr;
 #endif
 #endif
 
-#define ALWAYS_SYNC 0
-#define ALWAYS_FLUSH 0
-
 #define PITCH_NONE 0
 
 /** Record of a linear allocation in the aperture. */
@@ -504,8 +501,6 @@ i830_get_transformed_coordinates_3d(int x, int y, PictTransformPtr transform,
 
 void i830_enter_render(ScrnInfoPtr);
 
-extern void intel_sync(ScrnInfoPtr scrn);
-
 static inline void
 intel_debug_fallback(ScrnInfoPtr scrn, char *format, ...)
 {
diff --git a/src/i830_batchbuffer.c b/src/i830_batchbuffer.c
index 6481384e..c23b0b85 100644
--- a/src/i830_batchbuffer.c
+++ b/src/i830_batchbuffer.c
@@ -269,18 +269,3 @@ void intel_batch_wait_last(ScrnInfoPtr scrn)
 	drm_intel_bo_map(intel->last_batch_bo, TRUE);
 	drm_intel_bo_unmap(intel->last_batch_bo);
 }
-
-void intel_sync(ScrnInfoPtr scrn)
-{
-	intel_screen_private *intel = intel_get_screen_private(scrn);
-
-	if (I810_DEBUG & (DEBUG_VERBOSE_ACCEL | DEBUG_VERBOSE_SYNC))
-		ErrorF("I830Sync\n");
-
-	if (!scrn->vtSema || !intel->batch_bo || !intel->batch_ptr)
-		return;
-
-	intel_batch_emit_flush(scrn);
-	intel_batch_submit(scrn);
-	intel_batch_wait_last(scrn);
-}
diff --git a/src/i830_dri.c b/src/i830_dri.c
index 15aafdd7..efd8c4aa 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -395,9 +395,6 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
 	 * client gets to run again so flush now. */
 	intel_batch_emit_flush(scrn);
 	intel_batch_submit(scrn);
-#if ALWAYS_SYNC
-	intel_sync(scrn);
-#endif
 	drmCommandNone(intel->drmSubFD, DRM_I915_GEM_THROTTLE);
 }
 
diff --git a/src/i965_video.c b/src/i965_video.c
index c5378608..26755565 100644
--- a/src/i965_video.c
+++ b/src/i965_video.c
@@ -161,7 +161,6 @@ static void brw_debug(ScrnInfoPtr scrn, char *when)
 	int i;
 	uint32_t v;
 
-	intel_sync(scrn);
 	ErrorF("brw_debug: %s\n", when);
 	for (i = 0; svg_ctl_bits[i].name; i++) {
 		OUTREG(BRW_SVG_CTL, svg_ctl_bits[i].svg_ctl);