Rename the screen private from I830Ptr pI830 to intel_screen_private *intel.

This is the beginning of the campaign to remove some of the absurd use of
Hungarian in the driver.  Not that I don't like Hungarian, but I don't need
to know that pI830 is a pPointer.
(cherry picked from commit cc5d3ba3c331c3b1becf2d19277b24144bf34cfa)

Conflicts:

	src/i830.h
	src/i830_batchbuffer.c
	src/i830_batchbuffer.h
	src/i830_dri.c
	src/i830_driver.c
	src/i830_hwmc.c
	src/i830_memory.c
	src/i830_uxa.c
	src/i830_video.c
	src/i915_hwmc.c
	src/i965_hwmc.c

1 files changed, 19 insertions, 19 deletions

diff --git a/src/i830_accel.c b/src/i830_accel.c
index 98af39c1..a4f1d945 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -52,9 +52,9 @@ unsigned long intel_get_pixmap_offset(PixmapPtr pPix)
 {
 	ScreenPtr pScreen = pPix->drawable.pScreen;
 	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-	I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(pScrn);
 
-	return (unsigned long)pPix->devPrivate.ptr - (unsigned long)pI830->FbBase;
+	return (unsigned long)pPix->devPrivate.ptr - (unsigned long)intel->FbBase;
 }
 
 unsigned long intel_get_pixmap_pitch(PixmapPtr pPix)
@@ -65,8 +65,8 @@ unsigned long intel_get_pixmap_pitch(PixmapPtr pPix)
 int
 I830WaitLpRing(ScrnInfoPtr pScrn, int n, int timeout_millis)
 {
-   I830Ptr pI830 = I830PTR(pScrn);
-   I830RingBuffer *ring = &pI830->ring;
+   intel_screen_private *intel = intel_get_screen_private(pScrn);
+   I830RingBuffer *ring = &intel->ring;
    int iters = 0;
    unsigned int start = 0;
    unsigned int now = 0;
@@ -103,7 +103,7 @@ I830WaitLpRing(ScrnInfoPtr pScrn, int n, int timeout_millis)
 	 ErrorF("Error in I830WaitLpRing(), timeout for %d seconds\n",
 		timeout_millis/1000);
 	 ErrorF("space: %d wanted %d\n", ring->space, n);
-	 pI830->uxa_driver = NULL;
+	 intel->uxa_driver = NULL;
 	 FatalError("lockup\n");
       }
 
@@ -123,12 +123,12 @@ I830WaitLpRing(ScrnInfoPtr pScrn, int n, int timeout_millis)
 
 void I830Sync(ScrnInfoPtr pScrn)
 {
-	I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(pScrn);
 
 	if (I810_DEBUG & (DEBUG_VERBOSE_ACCEL | DEBUG_VERBOSE_SYNC))
 		ErrorF("I830Sync\n");
 
-	if (!pScrn->vtSema || !pI830->batch_bo)
+	if (!pScrn->vtSema || !intel->batch_bo)
 		return;
 
 	I830EmitFlush(pScrn);
@@ -139,10 +139,10 @@ void I830Sync(ScrnInfoPtr pScrn)
 
 void I830EmitFlush(ScrnInfoPtr pScrn)
 {
-	I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(pScrn);
 	int flags = MI_WRITE_DIRTY_STATE | MI_INVALIDATE_MAP_CACHE;
 
-	if (IS_I965G(pI830))
+	if (IS_I965G(intel))
 		flags = 0;
 
 	{
@@ -169,7 +169,7 @@ void i830_debug_sync(ScrnInfoPtr scrn)
 Bool I830AccelInit(ScreenPtr pScreen)
 {
 	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-	I830Ptr pI830 = I830PTR(pScrn);
+	intel_screen_private *intel = intel_get_screen_private(pScrn);
 
 	/* Limits are described in the BLT engine chapter under Graphics Data Size
 	 * Limitations, and the descriptions of SURFACE_STATE, 3DSTATE_BUFFER_INFO,
@@ -209,16 +209,16 @@ Bool I830AccelInit(ScreenPtr pScreen)
 	 * the front, which will have an appropriate pitch/offset already set up,
 	 * so UXA doesn't need to worry.
 	 */
-	if (IS_I965G(pI830)) {
-		pI830->accel_pixmap_offset_alignment = 4 * 2;
-		pI830->accel_pixmap_pitch_alignment = 64;
-		pI830->accel_max_x = 8192;
-		pI830->accel_max_y = 8192;
+	if (IS_I965G(intel)) {
+		intel->accel_pixmap_offset_alignment = 4 * 2;
+		intel->accel_pixmap_pitch_alignment = 64;
+		intel->accel_max_x = 8192;
+		intel->accel_max_y = 8192;
 	} else {
-		pI830->accel_pixmap_offset_alignment = 4;
-		pI830->accel_pixmap_pitch_alignment = 64;
-		pI830->accel_max_x = 2048;
-		pI830->accel_max_y = 2048;
+		intel->accel_pixmap_offset_alignment = 4;
+		intel->accel_pixmap_pitch_alignment = 64;
+		intel->accel_max_x = 2048;
+		intel->accel_max_y = 2048;
 	}
 
 	return i830_uxa_init(pScreen);