Rename the xf86 screen private from pScrn to scrn.

(cherry picked from commit af27a3a0a5645c6f41f583611bd0f2559dc7cb2f)

Conflicts:

	src/i830.h
	src/i830_accel.c
	src/i830_batchbuffer.c
	src/i830_display.h
	src/i830_driver.c
	src/i830_memory.c
	src/i830_video.c

1 files changed, 16 insertions, 16 deletions

diff --git a/src/i830_dri.c b/src/i830_dri.c
index 939af3ff..ef00539a 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -83,8 +83,8 @@ static DRI2BufferPtr
 I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
 {
 	ScreenPtr pScreen = pDraw->pScreen;
-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-	intel_screen_private *intel = intel_get_screen_private(pScrn);
+	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 	DRI2BufferPtr buffers;
 	dri_bo *bo;
 	int i;
@@ -165,8 +165,8 @@ I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
 		     unsigned int format)
 {
 	ScreenPtr pScreen = pDraw->pScreen;
-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-	intel_screen_private *intel = intel_get_screen_private(pScrn);
+	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 	DRI2Buffer2Ptr buffer;
 	dri_bo *bo;
 	I830DRI2BufferPrivatePtr privates;
@@ -279,8 +279,8 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
 	I830DRI2BufferPrivatePtr srcPrivate = pSrcBuffer->driverPrivate;
 	I830DRI2BufferPrivatePtr dstPrivate = pDstBuffer->driverPrivate;
 	ScreenPtr pScreen = pDraw->pScreen;
-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-	intel_screen_private *intel = intel_get_screen_private(pScrn);
+	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 	DrawablePtr src = (srcPrivate->attachment == DRI2BufferFrontLeft)
 	    ? pDraw : &srcPrivate->pPixmap->drawable;
 	DrawablePtr dst = (dstPrivate->attachment == DRI2BufferFrontLeft)
@@ -304,7 +304,7 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
 		xf86CrtcPtr crtc;
 
 		box = REGION_EXTENTS(unused, pGC->pCompositeClip);
-		crtc = i830_covering_crtc(pScrn, box, NULL, &crtcbox);
+		crtc = i830_covering_crtc(scrn, box, NULL, &crtcbox);
 
 		/* Make sure the CRTC is valid and this is the real front buffer */
 		if (crtc != NULL && !crtc->rotatedData) {
@@ -347,14 +347,14 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
 	 * rendering results may not hit the framebuffer until significantly
 	 * later.
 	 */
-	I830EmitFlush(pScrn);
+	I830EmitFlush(scrn);
 	intel->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);
+	intel_batch_flush(scrn, TRUE);
 #if ALWAYS_SYNC
-	I830Sync(pScrn);
+	I830Sync(scrn);
 #endif
 	drmCommandNone(intel->drmSubFD, DRM_I915_GEM_THROTTLE);
 
@@ -362,8 +362,8 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
 
 Bool I830DRI2ScreenInit(ScreenPtr pScreen)
 {
-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-	intel_screen_private *intel = intel_get_screen_private(pScrn);
+	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 	DRI2InfoRec info;
 	char *p;
 	int i;
@@ -380,7 +380,7 @@ Bool I830DRI2ScreenInit(ScreenPtr pScreen)
 	}
 
 	if (dri2_minor < 1) {
-		xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 			   "DRI2 requires DRI2 module version 1.1.0 or later\n");
 		return FALSE;
 	}
@@ -403,7 +403,7 @@ Bool I830DRI2ScreenInit(ScreenPtr pScreen)
 			break;
 	}
 	if (i == DRM_MAX_MINOR) {
-		xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 			   "DRI2: failed to open drm device\n");
 		return FALSE;
 	}
@@ -436,8 +436,8 @@ Bool I830DRI2ScreenInit(ScreenPtr pScreen)
 
 void I830DRI2CloseScreen(ScreenPtr pScreen)
 {
-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-	intel_screen_private *intel = intel_get_screen_private(pScrn);
+	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+	intel_screen_private *intel = intel_get_screen_private(scrn);
 
 	DRI2CloseScreen(pScreen);
 	intel->directRenderingType = DRI_NONE;