diff options
| -rw-r--r-- | src/i830.h | 3 | ||||
| -rw-r--r-- | src/i830_accel.c | 2 | ||||
| -rw-r--r-- | src/i830_dri.c | 2 | ||||
| -rw-r--r-- | src/i830_driver.c | 6 | ||||
| -rw-r--r-- | src/i830_memory.c | 5 | ||||
| -rw-r--r-- | src/i830_video.c | 2 | ||||
| -rw-r--r-- | src/i965_video.c | 2 |
7 files changed, 11 insertions, 11 deletions
@@ -746,7 +746,6 @@ unsigned long intel_get_pixmap_pitch(PixmapPtr pixmap); extern int I830WaitLpRing(ScrnInfoPtr scrn, int n, int timeout_millis); extern void I830SetPIOAccess(intel_screen_private *intel); extern void I830SetMMIOAccess(intel_screen_private *intel); -extern void I830Sync(ScrnInfoPtr scrn); extern void I830InitHWCursor(ScrnInfoPtr scrn); extern void I830SetPipeCursor (xf86CrtcPtr crtc, Bool force); extern Bool I830CursorInit(ScreenPtr pScreen); @@ -932,6 +931,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 i830_wait_ring_idle(ScrnInfoPtr scrn) { diff --git a/src/i830_accel.c b/src/i830_accel.c index fb04bdff..86d412df 100644 --- a/src/i830_accel.c +++ b/src/i830_accel.c @@ -120,7 +120,7 @@ I830WaitLpRing(ScrnInfoPtr scrn, int n, int timeout_millis) return iters; } -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 6b415a0b..5bb77556 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -356,7 +356,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 99bd5308..1e0d124c 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -876,7 +876,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) { @@ -904,7 +904,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); } @@ -2848,7 +2848,7 @@ static void I830LeaveVT(int scrnIndex, int flags) xf86_hide_cursors(scrn); - I830Sync(scrn); + intel_sync(scrn); if (!intel->use_drm_mode) { RestoreHWState(scrn); diff --git a/src/i830_memory.c b/src/i830_memory.c index 52f66f4d..eb963a76 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -79,6 +79,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <string.h> #include <sys/types.h> #include <sys/ioctl.h> +#include <errno.h> #include "xf86.h" #include "xf86_OSproc.h" @@ -1332,7 +1333,7 @@ i830_set_tiling(ScrnInfoPtr scrn, unsigned int offset, assert(tile_format != TILE_NONE); - I830Sync(scrn); + intel_sync(scrn); if (IS_I965G(intel)) max_fence = FENCE_NEW_NR; @@ -1533,8 +1534,6 @@ i830_clear_tiling(ScrnInfoPtr scrn, unsigned int fence_nr) Bool i830_bind_all_memory(ScrnInfoPtr scrn) { intel_screen_private *intel = intel_get_screen_private(scrn); - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); - int i; if (intel->memory_list == NULL) return TRUE; diff --git a/src/i830_video.c b/src/i830_video.c index 03dfdd52..797037e3 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -444,7 +444,7 @@ i830_overlay_on(ScrnInfoPtr scrn) OUT_BATCH(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP); OUT_BATCH(MI_NOOP); ADVANCE_BATCH(); - I830Sync(scrn); + intel_sync(scrn); /* * If we turned pipe A on up above, turn it 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); |