1 files changed, 285 insertions, 284 deletions

diff --git a/src/i830_dri.c b/src/i830_dri.c
index 1cf90d5d..b9d82b8c 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -74,88 +74,87 @@ extern XF86ModuleData dri2ModuleData;
 #endif
 
 typedef struct {
-    PixmapPtr pPixmap;
-    unsigned int attachment;
+	PixmapPtr pPixmap;
+	unsigned int attachment;
 } I830DRI2BufferPrivateRec, *I830DRI2BufferPrivatePtr;
 
 #ifndef USE_DRI2_1_1_0
 static DRI2BufferPtr
 I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
 {
-    ScreenPtr pScreen = pDraw->pScreen;
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-    DRI2BufferPtr buffers;
-    dri_bo *bo;
-    int i;
-    I830DRI2BufferPrivatePtr privates;
-    PixmapPtr pPixmap, pDepthPixmap;
-
-    buffers = xcalloc(count, sizeof *buffers);
-    if (buffers == NULL)
-	return NULL;
-    privates = xcalloc(count, sizeof *privates);
-    if (privates == NULL) {
-	xfree(buffers);
-	return NULL;
-    }
-
-    pDepthPixmap = NULL;
-    for (i = 0; i < count; i++) {
-	if (attachments[i] == DRI2BufferFrontLeft) {
-	    pPixmap = get_drawable_pixmap(pDraw);
-	    pPixmap->refcnt++;
-	} else if (attachments[i] == DRI2BufferStencil && pDepthPixmap) {
-	    pPixmap = pDepthPixmap;
-	    pPixmap->refcnt++;
-	} else {
-	    unsigned int hint = 0;
-
-	    switch (attachments[i]) {
-	    case DRI2BufferDepth:
-		if (SUPPORTS_YTILING(pI830))
-		    hint = INTEL_CREATE_PIXMAP_TILING_Y;
-		else
-		    hint = INTEL_CREATE_PIXMAP_TILING_X;
-		break;
-	    case DRI2BufferFakeFrontLeft:
-	    case DRI2BufferFakeFrontRight:
-	    case DRI2BufferBackLeft:
-	    case DRI2BufferBackRight:
-		    hint = INTEL_CREATE_PIXMAP_TILING_X;
-		break;
-	    }
-
-	    if (!pI830->tiling)
-		hint = 0;
-
-	    pPixmap = (*pScreen->CreatePixmap)(pScreen,
-					       pDraw->width,
-					       pDraw->height,
-					       pDraw->depth,
-					       hint);
-
+	ScreenPtr pScreen = pDraw->pScreen;
+	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	I830Ptr pI830 = I830PTR(pScrn);
+	DRI2BufferPtr buffers;
+	dri_bo *bo;
+	int i;
+	I830DRI2BufferPrivatePtr privates;
+	PixmapPtr pPixmap, pDepthPixmap;
+
+	buffers = xcalloc(count, sizeof *buffers);
+	if (buffers == NULL)
+		return NULL;
+	privates = xcalloc(count, sizeof *privates);
+	if (privates == NULL) {
+		xfree(buffers);
+		return NULL;
 	}
 
-	if (attachments[i] == DRI2BufferDepth)
-	    pDepthPixmap = pPixmap;
-
-	buffers[i].attachment = attachments[i];
-	buffers[i].pitch = pPixmap->devKind;
-	buffers[i].cpp = pPixmap->drawable.bitsPerPixel / 8;
-	buffers[i].driverPrivate = &privates[i];
-	buffers[i].flags = 0; /* not tiled */
-	privates[i].pPixmap = pPixmap;
-	privates[i].attachment = attachments[i];
+	pDepthPixmap = NULL;
+	for (i = 0; i < count; i++) {
+		if (attachments[i] == DRI2BufferFrontLeft) {
+			pPixmap = get_drawable_pixmap(pDraw);
+			pPixmap->refcnt++;
+		} else if (attachments[i] == DRI2BufferStencil && pDepthPixmap) {
+			pPixmap = pDepthPixmap;
+			pPixmap->refcnt++;
+		} else {
+			unsigned int hint = 0;
+
+			switch (attachments[i]) {
+			case DRI2BufferDepth:
+				if (SUPPORTS_YTILING(pI830))
+					hint = INTEL_CREATE_PIXMAP_TILING_Y;
+				else
+					hint = INTEL_CREATE_PIXMAP_TILING_X;
+				break;
+			case DRI2BufferFakeFrontLeft:
+			case DRI2BufferFakeFrontRight:
+			case DRI2BufferBackLeft:
+			case DRI2BufferBackRight:
+				hint = INTEL_CREATE_PIXMAP_TILING_X;
+				break;
+			}
+
+			if (!pI830->tiling)
+				hint = 0;
+
+			pPixmap = (*pScreen->CreatePixmap) (pScreen,
+							    pDraw->width,
+							    pDraw->height,
+							    pDraw->depth, hint);
+
+		}
+
+		if (attachments[i] == DRI2BufferDepth)
+			pDepthPixmap = pPixmap;
+
+		buffers[i].attachment = attachments[i];
+		buffers[i].pitch = pPixmap->devKind;
+		buffers[i].cpp = pPixmap->drawable.bitsPerPixel / 8;
+		buffers[i].driverPrivate = &privates[i];
+		buffers[i].flags = 0;	/* not tiled */
+		privates[i].pPixmap = pPixmap;
+		privates[i].attachment = attachments[i];
+
+		bo = i830_get_pixmap_bo(pPixmap);
+		if (dri_bo_flink(bo, &buffers[i].name) != 0) {
+			/* failed to name buffer */
+		}
 
-	bo = i830_get_pixmap_bo (pPixmap);
-	if (dri_bo_flink(bo, &buffers[i].name) != 0) {
-	    /* failed to name buffer */
 	}
 
-    }
-
-    return buffers;
+	return buffers;
 }
 
 #else
@@ -164,72 +163,72 @@ static DRI2Buffer2Ptr
 I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
 		     unsigned int format)
 {
-    ScreenPtr pScreen = pDraw->pScreen;
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-    DRI2Buffer2Ptr buffer;
-    dri_bo *bo;
-    I830DRI2BufferPrivatePtr privates;
-    PixmapPtr pPixmap;
-
-    buffer = xcalloc(1, sizeof *buffer);
-    if (buffer == NULL)
-	return NULL;
-    privates = xcalloc(1, sizeof *privates);
-    if (privates == NULL) {
-	xfree(buffer);
-	return NULL;
-    }
-
-    if (attachment == DRI2BufferFrontLeft) {
-	pPixmap = get_drawable_pixmap(pDraw);
-	pPixmap->refcnt++;
-    } else {
-	unsigned int hint = 0;
-
-	switch (attachment) {
-	case DRI2BufferDepth:
-	case DRI2BufferDepthStencil:
-	    if (SUPPORTS_YTILING(pI830))
-		hint = INTEL_CREATE_PIXMAP_TILING_Y;
-	    else
-		hint = INTEL_CREATE_PIXMAP_TILING_X;
-	    break;
-	case DRI2BufferFakeFrontLeft:
-	case DRI2BufferFakeFrontRight:
-	case DRI2BufferBackLeft:
-	case DRI2BufferBackRight:
-	    hint = INTEL_CREATE_PIXMAP_TILING_X;
-	    break;
+	ScreenPtr pScreen = pDraw->pScreen;
+	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	I830Ptr pI830 = I830PTR(pScrn);
+	DRI2Buffer2Ptr buffer;
+	dri_bo *bo;
+	I830DRI2BufferPrivatePtr privates;
+	PixmapPtr pPixmap;
+
+	buffer = xcalloc(1, sizeof *buffer);
+	if (buffer == NULL)
+		return NULL;
+	privates = xcalloc(1, sizeof *privates);
+	if (privates == NULL) {
+		xfree(buffer);
+		return NULL;
 	}
 
-	if (!pI830->tiling)
-	    hint = 0;
-
-	pPixmap = (*pScreen->CreatePixmap)(pScreen,
-					   pDraw->width,
-					   pDraw->height,
-					   (format != 0)?format:pDraw->depth,
-					   hint);
-
-    }
-
+	if (attachment == DRI2BufferFrontLeft) {
+		pPixmap = get_drawable_pixmap(pDraw);
+		pPixmap->refcnt++;
+	} else {
+		unsigned int hint = 0;
+
+		switch (attachment) {
+		case DRI2BufferDepth:
+		case DRI2BufferDepthStencil:
+			if (SUPPORTS_YTILING(pI830))
+				hint = INTEL_CREATE_PIXMAP_TILING_Y;
+			else
+				hint = INTEL_CREATE_PIXMAP_TILING_X;
+			break;
+		case DRI2BufferFakeFrontLeft:
+		case DRI2BufferFakeFrontRight:
+		case DRI2BufferBackLeft:
+		case DRI2BufferBackRight:
+			hint = INTEL_CREATE_PIXMAP_TILING_X;
+			break;
+		}
+
+		if (!pI830->tiling)
+			hint = 0;
+
+		pPixmap = (*pScreen->CreatePixmap) (pScreen,
+						    pDraw->width,
+						    pDraw->height,
+						    (format !=
+						     0) ? format : pDraw->depth,
+						    hint);
 
-    buffer->attachment = attachment;
-    buffer->pitch = pPixmap->devKind;
-    buffer->cpp = pPixmap->drawable.bitsPerPixel / 8;
-    buffer->driverPrivate = privates;
-    buffer->format = format;
-    buffer->flags = 0; /* not tiled */
-    privates->pPixmap = pPixmap;
-    privates->attachment = attachment;
+	}
 
-    bo = i830_get_pixmap_bo (pPixmap);
-    if (dri_bo_flink(bo, &buffer->name) != 0) {
-	/* failed to name buffer */
-    }
+	buffer->attachment = attachment;
+	buffer->pitch = pPixmap->devKind;
+	buffer->cpp = pPixmap->drawable.bitsPerPixel / 8;
+	buffer->driverPrivate = privates;
+	buffer->format = format;
+	buffer->flags = 0;	/* not tiled */
+	privates->pPixmap = pPixmap;
+	privates->attachment = attachment;
+
+	bo = i830_get_pixmap_bo(pPixmap);
+	if (dri_bo_flink(bo, &buffer->name) != 0) {
+		/* failed to name buffer */
+	}
 
-    return buffer;
+	return buffer;
 }
 
 #endif
@@ -239,37 +238,34 @@ I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
 static void
 I830DRI2DestroyBuffers(DrawablePtr pDraw, DRI2BufferPtr buffers, int count)
 {
-    ScreenPtr pScreen = pDraw->pScreen;
-    I830DRI2BufferPrivatePtr private;
-    int i;
-
-    for (i = 0; i < count; i++)
-    {
-	private = buffers[i].driverPrivate;
-	(*pScreen->DestroyPixmap)(private->pPixmap);
-    }
-
-    if (buffers)
-    {
-	xfree(buffers[0].driverPrivate);
-	xfree(buffers);
-    }
+	ScreenPtr pScreen = pDraw->pScreen;
+	I830DRI2BufferPrivatePtr private;
+	int i;
+
+	for (i = 0; i < count; i++) {
+		private = buffers[i].driverPrivate;
+		(*pScreen->DestroyPixmap) (private->pPixmap);
+	}
+
+	if (buffers) {
+		xfree(buffers[0].driverPrivate);
+		xfree(buffers);
+	}
 }
 
 #else
 
-static void
-I830DRI2DestroyBuffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer)
+static void I830DRI2DestroyBuffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer)
 {
-    if (buffer) {
-	I830DRI2BufferPrivatePtr private = buffer->driverPrivate;
-	ScreenPtr pScreen = pDraw->pScreen;
+	if (buffer) {
+		I830DRI2BufferPrivatePtr private = buffer->driverPrivate;
+		ScreenPtr pScreen = pDraw->pScreen;
 
-	(*pScreen->DestroyPixmap)(private->pPixmap);
+		(*pScreen->DestroyPixmap) (private->pPixmap);
 
-	xfree(private);
-	xfree(buffer);
-    }
+		xfree(private);
+		xfree(buffer);
+	}
 }
 
 #endif
@@ -278,164 +274,169 @@ static void
 I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
 		   DRI2BufferPtr pDstBuffer, DRI2BufferPtr pSrcBuffer)
 {
-    I830DRI2BufferPrivatePtr srcPrivate = pSrcBuffer->driverPrivate;
-    I830DRI2BufferPrivatePtr dstPrivate = pDstBuffer->driverPrivate;
-    ScreenPtr pScreen = pDraw->pScreen;
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-    DrawablePtr src = (srcPrivate->attachment == DRI2BufferFrontLeft)
-	? pDraw : &srcPrivate->pPixmap->drawable;
-    DrawablePtr dst = (dstPrivate->attachment == DRI2BufferFrontLeft)
-	? pDraw : &dstPrivate->pPixmap->drawable;
-    RegionPtr pCopyClip;
-    GCPtr pGC;
-
-    pGC = GetScratchGC(pDraw->depth, pScreen);
-    pCopyClip = REGION_CREATE(pScreen, NULL, 0);
-    REGION_COPY(pScreen, pCopyClip, pRegion);
-    (*pGC->funcs->ChangeClip) (pGC, CT_REGION, pCopyClip, 0);
-    ValidateGC(dst, pGC);
-
-    /* Wait for the scanline to be outside the region to be copied */
-    if (pixmap_is_scanout(get_drawable_pixmap(dst)) && pI830->swapbuffers_wait) {
-	BoxPtr box;
-	BoxRec crtcbox;
-	int y1, y2;
-	int pipe = -1, event, load_scan_lines_pipe;
-	xf86CrtcPtr crtc;
-
-	box = REGION_EXTENTS(unused, pGC->pCompositeClip);
-	crtc = i830_covering_crtc(pScrn, box, NULL, &crtcbox);
-
-	/* Make sure the CRTC is valid and this is the real front buffer */
-	if (crtc != NULL && !crtc->rotatedData) {
-	    pipe = i830_crtc_to_pipe(crtc);
-
-	    if (pipe == 0) {
-		event = MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW;
-		load_scan_lines_pipe = MI_LOAD_SCAN_LINES_DISPLAY_PIPEA;
-	    } else {
-		event = MI_WAIT_FOR_PIPEB_SCAN_LINE_WINDOW;
-		load_scan_lines_pipe = MI_LOAD_SCAN_LINES_DISPLAY_PIPEB;
-	    }
-
-	    /* Make sure we don't wait for a scanline that will never occur */
-	    y1 = (crtcbox.y1 <= box->y1) ? box->y1 - crtcbox.y1 : 0;
-	    y2 = (box->y2 <= crtcbox.y2) ?
-		box->y2 - crtcbox.y1 : crtcbox.y2 - crtcbox.y1;
-
-	    BEGIN_BATCH(5);
-	    /* The documentation says that the LOAD_SCAN_LINES command
-	     * always comes in pairs. Don't ask me why. */
-	    OUT_BATCH(MI_LOAD_SCAN_LINES_INCL | load_scan_lines_pipe);
-	    OUT_BATCH((y1 << 16) | y2);
-	    OUT_BATCH(MI_LOAD_SCAN_LINES_INCL | load_scan_lines_pipe);
-	    OUT_BATCH((y1 << 16) | y2);
-	    OUT_BATCH(MI_WAIT_FOR_EVENT | event);
-	    ADVANCE_BATCH();
+	I830DRI2BufferPrivatePtr srcPrivate = pSrcBuffer->driverPrivate;
+	I830DRI2BufferPrivatePtr dstPrivate = pDstBuffer->driverPrivate;
+	ScreenPtr pScreen = pDraw->pScreen;
+	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	I830Ptr pI830 = I830PTR(pScrn);
+	DrawablePtr src = (srcPrivate->attachment == DRI2BufferFrontLeft)
+	    ? pDraw : &srcPrivate->pPixmap->drawable;
+	DrawablePtr dst = (dstPrivate->attachment == DRI2BufferFrontLeft)
+	    ? pDraw : &dstPrivate->pPixmap->drawable;
+	RegionPtr pCopyClip;
+	GCPtr pGC;
+
+	pGC = GetScratchGC(pDraw->depth, pScreen);
+	pCopyClip = REGION_CREATE(pScreen, NULL, 0);
+	REGION_COPY(pScreen, pCopyClip, pRegion);
+	(*pGC->funcs->ChangeClip) (pGC, CT_REGION, pCopyClip, 0);
+	ValidateGC(dst, pGC);
+
+	/* Wait for the scanline to be outside the region to be copied */
+	if (pixmap_is_scanout(get_drawable_pixmap(dst))
+	    && pI830->swapbuffers_wait) {
+		BoxPtr box;
+		BoxRec crtcbox;
+		int y1, y2;
+		int pipe = -1, event, load_scan_lines_pipe;
+		xf86CrtcPtr crtc;
+
+		box = REGION_EXTENTS(unused, pGC->pCompositeClip);
+		crtc = i830_covering_crtc(pScrn, box, NULL, &crtcbox);
+
+		/* Make sure the CRTC is valid and this is the real front buffer */
+		if (crtc != NULL && !crtc->rotatedData) {
+			pipe = i830_crtc_to_pipe(crtc);
+
+			if (pipe == 0) {
+				event = MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW;
+				load_scan_lines_pipe =
+				    MI_LOAD_SCAN_LINES_DISPLAY_PIPEA;
+			} else {
+				event = MI_WAIT_FOR_PIPEB_SCAN_LINE_WINDOW;
+				load_scan_lines_pipe =
+				    MI_LOAD_SCAN_LINES_DISPLAY_PIPEB;
+			}
+
+			/* Make sure we don't wait for a scanline that will never occur */
+			y1 = (crtcbox.y1 <= box->y1) ? box->y1 - crtcbox.y1 : 0;
+			y2 = (box->y2 <= crtcbox.y2) ?
+			    box->y2 - crtcbox.y1 : crtcbox.y2 - crtcbox.y1;
+
+			BEGIN_BATCH(5);
+			/* The documentation says that the LOAD_SCAN_LINES command
+			 * always comes in pairs. Don't ask me why. */
+			OUT_BATCH(MI_LOAD_SCAN_LINES_INCL |
+				  load_scan_lines_pipe);
+			OUT_BATCH((y1 << 16) | y2);
+			OUT_BATCH(MI_LOAD_SCAN_LINES_INCL |
+				  load_scan_lines_pipe);
+			OUT_BATCH((y1 << 16) | y2);
+			OUT_BATCH(MI_WAIT_FOR_EVENT | event);
+			ADVANCE_BATCH();
+		}
 	}
-    }
-
-    (*pGC->ops->CopyArea)(src, dst,
-			  pGC, 0, 0, pDraw->width, pDraw->height, 0, 0);
-    FreeScratchGC(pGC);
-
-    /* Emit a flush of the rendering cache, or on the 965 and beyond
-     * rendering results may not hit the framebuffer until significantly
-     * later.
-     */
-    I830EmitFlush(pScrn);
-    pI830->need_mi_flush = FALSE;
-
-    /* We can't rely on getting into the block handler before the DRI
-     * client gets to run again so flush now. */
-    intel_batch_flush(pScrn, TRUE);
+
+	(*pGC->ops->CopyArea) (src, dst,
+			       pGC, 0, 0, pDraw->width, pDraw->height, 0, 0);
+	FreeScratchGC(pGC);
+
+	/* Emit a flush of the rendering cache, or on the 965 and beyond
+	 * rendering results may not hit the framebuffer until significantly
+	 * later.
+	 */
+	I830EmitFlush(pScrn);
+	pI830->need_mi_flush = FALSE;
+
+	/* We can't rely on getting into the block handler before the DRI
+	 * client gets to run again so flush now. */
+	intel_batch_flush(pScrn, TRUE);
 #if ALWAYS_SYNC
-    I830Sync(pScrn);
+	I830Sync(pScrn);
 #endif
-    drmCommandNone(pI830->drmSubFD, DRM_I915_GEM_THROTTLE);
+	drmCommandNone(pI830->drmSubFD, DRM_I915_GEM_THROTTLE);
 
 }
 
 Bool I830DRI2ScreenInit(ScreenPtr pScreen)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
-    DRI2InfoRec info;
-    char *p;
-    int i;
-    struct stat sbuf;
-    dev_t d;
+	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	I830Ptr pI830 = I830PTR(pScrn);
+	DRI2InfoRec info;
+	char *p;
+	int i;
+	struct stat sbuf;
+	dev_t d;
 #ifdef USE_DRI2_1_1_0
-    int dri2_major = 1;
-    int dri2_minor = 0;
+	int dri2_major = 1;
+	int dri2_minor = 0;
 #endif
 
 #ifdef USE_DRI2_1_1_0
-    if (xf86LoaderCheckSymbol("DRI2Version")) {
-	DRI2Version(& dri2_major, & dri2_minor);
-    }
-
-    if (dri2_minor < 1) {
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		   "DRI2 requires DRI2 module version 1.1.0 or later\n");
-	return FALSE;
-    }
+	if (xf86LoaderCheckSymbol("DRI2Version")) {
+		DRI2Version(&dri2_major, &dri2_minor);
+	}
+
+	if (dri2_minor < 1) {
+		xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+			   "DRI2 requires DRI2 module version 1.1.0 or later\n");
+		return FALSE;
+	}
 #endif
 
-    info.fd = pI830->drmSubFD;
+	info.fd = pI830->drmSubFD;
 
-    /* The whole drmOpen thing is a fiasco and we need to find a way
-     * back to just using open(2).  For now, however, lets just make
-     * things worse with even more ad hoc directory walking code to
-     * discover the device file name. */
+	/* The whole drmOpen thing is a fiasco and we need to find a way
+	 * back to just using open(2).  For now, however, lets just make
+	 * things worse with even more ad hoc directory walking code to
+	 * discover the device file name. */
 
-    fstat(info.fd, &sbuf);
-    d = sbuf.st_rdev;
+	fstat(info.fd, &sbuf);
+	d = sbuf.st_rdev;
 
-    p = pI830->deviceName;
-    for (i = 0; i < DRM_MAX_MINOR; i++) {
-	sprintf(p, DRM_DEV_NAME, DRM_DIR_NAME, i);
-	if (stat(p, &sbuf) == 0 && sbuf.st_rdev == d)
-	    break;
-    }
-    if (i == DRM_MAX_MINOR) {
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		   "DRI2: failed to open drm device\n");
-	return FALSE;
-    }
+	p = pI830->deviceName;
+	for (i = 0; i < DRM_MAX_MINOR; i++) {
+		sprintf(p, DRM_DEV_NAME, DRM_DIR_NAME, i);
+		if (stat(p, &sbuf) == 0 && sbuf.st_rdev == d)
+			break;
+	}
+	if (i == DRM_MAX_MINOR) {
+		xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+			   "DRI2: failed to open drm device\n");
+		return FALSE;
+	}
 
-    info.driverName = IS_I965G(pI830) ? "i965" : "i915";
-    info.deviceName = p;
+	info.driverName = IS_I965G(pI830) ? "i965" : "i915";
+	info.deviceName = p;
 
 #if DRI2INFOREC_VERSION >= 3
-    info.version = 3;
-    info.CreateBuffer = I830DRI2CreateBuffer;
-    info.DestroyBuffer = I830DRI2DestroyBuffer;
+	info.version = 3;
+	info.CreateBuffer = I830DRI2CreateBuffer;
+	info.DestroyBuffer = I830DRI2DestroyBuffer;
 #else
 # ifdef USE_DRI2_1_1_0
-    info.version = 2;
-    info.CreateBuffers = NULL;
-    info.DestroyBuffers = NULL;
-    info.CreateBuffer = I830DRI2CreateBuffer;
-    info.DestroyBuffer = I830DRI2DestroyBuffer;
+	info.version = 2;
+	info.CreateBuffers = NULL;
+	info.DestroyBuffers = NULL;
+	info.CreateBuffer = I830DRI2CreateBuffer;
+	info.DestroyBuffer = I830DRI2DestroyBuffer;
 # else
-    info.version = 1;
-    info.CreateBuffers = I830DRI2CreateBuffers;
-    info.DestroyBuffers = I830DRI2DestroyBuffers;
+	info.version = 1;
+	info.CreateBuffers = I830DRI2CreateBuffers;
+	info.DestroyBuffers = I830DRI2DestroyBuffers;
 # endif
 #endif
 
-    info.CopyRegion = I830DRI2CopyRegion;
+	info.CopyRegion = I830DRI2CopyRegion;
 
-    return DRI2ScreenInit(pScreen, &info);
+	return DRI2ScreenInit(pScreen, &info);
 }
 
 void I830DRI2CloseScreen(ScreenPtr pScreen)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    I830Ptr pI830 = I830PTR(pScrn);
+	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	I830Ptr pI830 = I830PTR(pScrn);
 
-    DRI2CloseScreen(pScreen);
-    pI830->directRenderingType = DRI_NONE;
+	DRI2CloseScreen(pScreen);
+	pI830->directRenderingType = DRI_NONE;
 }