Rename I830Sync() to intel_sync()

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

5 files changed, 8 insertions, 7 deletions

diff --git a/src/i830.h b/src/i830.h
index c8950217..21a50259 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -410,7 +410,6 @@ unsigned long intel_get_pixmap_pitch(PixmapPtr pixmap);
 #include "i830_batchbuffer.h"
 
 /* I830 specific functions */
-extern void I830Sync(ScrnInfoPtr scrn);
 extern void IntelEmitInvarientState(ScrnInfoPtr scrn);
 extern void I830EmitInvarientState(ScrnInfoPtr scrn);
 extern void I915EmitInvarientState(ScrnInfoPtr scrn);
@@ -517,6 +516,8 @@ 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_accel.c b/src/i830_accel.c
index 17c34090..0f922a89 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -51,7 +51,7 @@ unsigned long intel_get_pixmap_pitch(PixmapPtr pixmap)
 	return (unsigned long)pixmap->devKind;
 }
 
-void I830Sync(ScrnInfoPtr scrn)
+void intel_sync(ScrnInfoPtr scrn)
 {
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 
diff --git a/src/i830_dri.c b/src/i830_dri.c
index a9eed5bd..3b128f48 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -354,7 +354,7 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
 	intel->need_mi_flush = FALSE;
 	intel_batch_flush(scrn, TRUE);
 #if ALWAYS_SYNC
-	I830Sync(scrn);
+	intel_sync(scrn);
 #endif
 	drmCommandNone(intel->drmSubFD, DRM_I915_GEM_THROTTLE);
 
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 94837eb8..7ab4e968 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -428,7 +428,7 @@ static Bool i830_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
 		xf86DrvMsg(scrn->scrnIndex, X_INFO,
 			   "Allocate new frame buffer %dx%d stride %d\n", width,
 			   height, scrn->displayWidth);
-		I830Sync(scrn);
+		intel_sync(scrn);
 		i830WaitForVblank(scrn);
 		new_front = i830_allocate_framebuffer(scrn);
 		if (!new_front) {
@@ -456,7 +456,7 @@ static Bool i830_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
 			   "New front buffer at 0x%lx\n",
 			   intel->front_buffer->offset);
 		i830_set_new_crtc_bo(scrn);
-		I830Sync(scrn);
+		intel_sync(scrn);
 		i830WaitForVblank(scrn);
 		i830_free_memory(scrn, old_front);
 	}
@@ -1462,7 +1462,7 @@ static void I830LeaveVT(int scrnIndex, int flags)
 
 	xf86_hide_cursors(scrn);
 
-	I830Sync(scrn);
+	intel_sync(scrn);
 
 	intel_batch_teardown(scrn);
 
diff --git a/src/i965_video.c b/src/i965_video.c
index 6225aa48..f17999cf 100644
--- a/src/i965_video.c
+++ b/src/i965_video.c
@@ -161,7 +161,7 @@ static void brw_debug(ScrnInfoPtr scrn, char *when)
 	int i;
 	uint32_t v;
 
-	I830Sync(scrn);
+	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);