Call pPixmaps plain old pixmaps.

12 files changed, 93 insertions, 93 deletions

diff --git a/src/i830.h b/src/i830.h
index 442ad100..07b6c8de 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -314,7 +314,7 @@ intel_get_screen_private(ScrnInfoPtr scrn)
 #define ALIGN(i,m)	(((i) + (m) - 1) & ~((m) - 1))
 #define MIN(a,b)	((a) < (b) ? (a) : (b))
 
-unsigned long intel_get_pixmap_pitch(PixmapPtr pPix);
+unsigned long intel_get_pixmap_pitch(PixmapPtr pixmap);
 
 /* Batchbuffer support macros and functions */
 #include "i830_batchbuffer.h"
diff --git a/src/i830_accel.c b/src/i830_accel.c
index 1a7c61fa..11a75f44 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -48,9 +48,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "i830_ring.h"
 #include "i915_drm.h"
 
-unsigned long intel_get_pixmap_pitch(PixmapPtr pPix)
+unsigned long intel_get_pixmap_pitch(PixmapPtr pixmap)
 {
-	return (unsigned long)pPix->devKind;
+	return (unsigned long)pixmap->devKind;
 }
 
 void I830Sync(ScrnInfoPtr scrn)
diff --git a/src/i830_batchbuffer.h b/src/i830_batchbuffer.h
index f351a1af..274e82f9 100644
--- a/src/i830_batchbuffer.h
+++ b/src/i830_batchbuffer.h
@@ -93,11 +93,11 @@ intel_batch_emit_reloc(intel_screen_private *intel,
 }
 
 static inline void
-intel_batch_emit_reloc_pixmap(intel_screen_private *intel, PixmapPtr pPixmap,
+intel_batch_emit_reloc_pixmap(intel_screen_private *intel, PixmapPtr pixmap,
 			      uint32_t read_domains, uint32_t write_domain,
 			      uint32_t delta)
 {
-	dri_bo *bo = i830_get_pixmap_bo(pPixmap);
+	dri_bo *bo = i830_get_pixmap_bo(pixmap);
 	assert(intel->batch_ptr != NULL);
 	assert(intel_batch_space(intel) >= 4);
 	intel_batch_emit_reloc(intel, bo, read_domains, write_domain, delta);
@@ -108,8 +108,8 @@ intel_batch_emit_reloc_pixmap(intel_screen_private *intel, PixmapPtr pPixmap,
 #define OUT_RELOC(bo, read_domains, write_domains, delta) \
 	intel_batch_emit_reloc (intel, bo, read_domains, write_domains, delta)
 
-#define OUT_RELOC_PIXMAP(pPixmap, reads, write, delta)	\
-	intel_batch_emit_reloc_pixmap(intel, pPixmap, reads, write, delta)
+#define OUT_RELOC_PIXMAP(pixmap, reads, write, delta)	\
+	intel_batch_emit_reloc_pixmap(intel, pixmap, reads, write, delta)
 
 union intfloat {
 	float f;
diff --git a/src/i830_dri.c b/src/i830_dri.c
index 1c5ebbe8..ea3d444c 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -74,7 +74,7 @@ extern XF86ModuleData dri2ModuleData;
 #endif
 
 typedef struct {
-	PixmapPtr pPixmap;
+	PixmapPtr pixmap;
 	unsigned int attachment;
 } I830DRI2BufferPrivateRec, *I830DRI2BufferPrivatePtr;
 
@@ -89,7 +89,7 @@ I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
 	dri_bo *bo;
 	int i;
 	I830DRI2BufferPrivatePtr privates;
-	PixmapPtr pPixmap, pDepthPixmap;
+	PixmapPtr pixmap, pDepthPixmap;
 
 	buffers = xcalloc(count, sizeof *buffers);
 	if (buffers == NULL)
@@ -103,11 +103,11 @@ I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
 	pDepthPixmap = NULL;
 	for (i = 0; i < count; i++) {
 		if (attachments[i] == DRI2BufferFrontLeft) {
-			pPixmap = get_drawable_pixmap(pDraw);
-			pPixmap->refcnt++;
+			pixmap = get_drawable_pixmap(pDraw);
+			pixmap->refcnt++;
 		} else if (attachments[i] == DRI2BufferStencil && pDepthPixmap) {
-			pPixmap = pDepthPixmap;
-			pPixmap->refcnt++;
+			pixmap = pDepthPixmap;
+			pixmap->refcnt++;
 		} else {
 			unsigned int hint = 0;
 
@@ -129,7 +129,7 @@ I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
 			if (!intel->tiling)
 				hint = 0;
 
-			pPixmap = (*pScreen->CreatePixmap) (pScreen,
+			pixmap = (*pScreen->CreatePixmap) (pScreen,
 							    pDraw->width,
 							    pDraw->height,
 							    pDraw->depth, hint);
@@ -137,17 +137,17 @@ I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
 		}
 
 		if (attachments[i] == DRI2BufferDepth)
-			pDepthPixmap = pPixmap;
+			pDepthPixmap = pixmap;
 
 		buffers[i].attachment = attachments[i];
-		buffers[i].pitch = pPixmap->devKind;
-		buffers[i].cpp = pPixmap->drawable.bitsPerPixel / 8;
+		buffers[i].pitch = pixmap->devKind;
+		buffers[i].cpp = pixmap->drawable.bitsPerPixel / 8;
 		buffers[i].driverPrivate = &privates[i];
 		buffers[i].flags = 0;	/* not tiled */
-		privates[i].pPixmap = pPixmap;
+		privates[i].pixmap = pixmap;
 		privates[i].attachment = attachments[i];
 
-		bo = i830_get_pixmap_bo(pPixmap);
+		bo = i830_get_pixmap_bo(pixmap);
 		if (dri_bo_flink(bo, &buffers[i].name) != 0) {
 			/* failed to name buffer */
 		}
@@ -169,7 +169,7 @@ I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
 	DRI2Buffer2Ptr buffer;
 	dri_bo *bo;
 	I830DRI2BufferPrivatePtr privates;
-	PixmapPtr pPixmap;
+	PixmapPtr pixmap;
 
 	buffer = xcalloc(1, sizeof *buffer);
 	if (buffer == NULL)
@@ -181,8 +181,8 @@ I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
 	}
 
 	if (attachment == DRI2BufferFrontLeft) {
-		pPixmap = get_drawable_pixmap(pDraw);
-		pPixmap->refcnt++;
+		pixmap = get_drawable_pixmap(pDraw);
+		pixmap->refcnt++;
 	} else {
 		unsigned int hint = 0;
 
@@ -205,7 +205,7 @@ I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
 		if (!intel->tiling)
 			hint = 0;
 
-		pPixmap = (*pScreen->CreatePixmap) (pScreen,
+		pixmap = (*pScreen->CreatePixmap) (pScreen,
 						    pDraw->width,
 						    pDraw->height,
 						    (format !=
@@ -215,15 +215,15 @@ I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
 	}
 
 	buffer->attachment = attachment;
-	buffer->pitch = pPixmap->devKind;
-	buffer->cpp = pPixmap->drawable.bitsPerPixel / 8;
+	buffer->pitch = pixmap->devKind;
+	buffer->cpp = pixmap->drawable.bitsPerPixel / 8;
 	buffer->driverPrivate = privates;
 	buffer->format = format;
 	buffer->flags = 0;	/* not tiled */
-	privates->pPixmap = pPixmap;
+	privates->pixmap = pixmap;
 	privates->attachment = attachment;
 
-	bo = i830_get_pixmap_bo(pPixmap);
+	bo = i830_get_pixmap_bo(pixmap);
 	if (dri_bo_flink(bo, &buffer->name) != 0) {
 		/* failed to name buffer */
 	}
@@ -244,7 +244,7 @@ I830DRI2DestroyBuffers(DrawablePtr pDraw, DRI2BufferPtr buffers, int count)
 
 	for (i = 0; i < count; i++) {
 		private = buffers[i].driverPrivate;
-		(*pScreen->DestroyPixmap) (private->pPixmap);
+		(*pScreen->DestroyPixmap) (private->pixmap);
 	}
 
 	if (buffers) {
@@ -261,7 +261,7 @@ static void I830DRI2DestroyBuffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer)
 		I830DRI2BufferPrivatePtr private = buffer->driverPrivate;
 		ScreenPtr pScreen = pDraw->pScreen;
 
-		(*pScreen->DestroyPixmap) (private->pPixmap);
+		(*pScreen->DestroyPixmap) (private->pixmap);
 
 		xfree(private);
 		xfree(buffer);
@@ -280,9 +280,9 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
 	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	DrawablePtr src = (srcPrivate->attachment == DRI2BufferFrontLeft)
-	    ? pDraw : &srcPrivate->pPixmap->drawable;
+	    ? pDraw : &srcPrivate->pixmap->drawable;
 	DrawablePtr dst = (dstPrivate->attachment == DRI2BufferFrontLeft)
-	    ? pDraw : &dstPrivate->pPixmap->drawable;
+	    ? pDraw : &dstPrivate->pixmap->drawable;
 	RegionPtr pCopyClip;
 	GCPtr pGC;
 
diff --git a/src/i830_render.c b/src/i830_render.c
index d37e19d3..a7fac173 100644
--- a/src/i830_render.c
+++ b/src/i830_render.c
@@ -267,7 +267,7 @@ static uint32_t i8xx_get_card_format(PicturePtr picture)
 	FatalError("Unsupported format type %d\n", picture->format);
 }
 
-static void i830_texture_setup(PicturePtr picture, PixmapPtr pPix, int unit)
+static void i830_texture_setup(PicturePtr picture, PixmapPtr pixmap, int unit)
 {
 
 	ScrnInfoPtr scrn = xf86Screens[picture->pDrawable->pScreen->myNum];
@@ -276,9 +276,9 @@ static void i830_texture_setup(PicturePtr picture, PixmapPtr pPix, int unit)
 	uint32_t wrap_mode;
 	uint32_t texcoordtype;
 
-	pitch = intel_get_pixmap_pitch(pPix);
-	intel->scale_units[unit][0] = pPix->drawable.width;
-	intel->scale_units[unit][1] = pPix->drawable.height;
+	pitch = intel_get_pixmap_pitch(pixmap);
+	intel->scale_units[unit][0] = pixmap->drawable.width;
+	intel->scale_units[unit][1] = pixmap->drawable.height;
 	intel->transform[unit] = picture->transform;
 
 	if (i830_transform_is_affine(intel->transform[unit]))
@@ -321,9 +321,9 @@ static void i830_texture_setup(PicturePtr picture, PixmapPtr pPix, int unit)
 	filter |= (MIPFILTER_NONE << TM0S3_MIP_FILTER_SHIFT);
 
 	{
-		if (pPix->drawable.bitsPerPixel == 8)
+		if (pixmap->drawable.bitsPerPixel == 8)
 			format |= MAPSURF_8BIT;
-		else if (pPix->drawable.bitsPerPixel == 16)
+		else if (pixmap->drawable.bitsPerPixel == 16)
 			format |= MAPSURF_16BIT;
 		else
 			format |= MAPSURF_32BIT;
@@ -331,10 +331,10 @@ static void i830_texture_setup(PicturePtr picture, PixmapPtr pPix, int unit)
 		BEGIN_BATCH(10);
 		OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_2 |
 			  LOAD_TEXTURE_MAP(unit) | 4);
-		OUT_RELOC_PIXMAP(pPix, I915_GEM_DOMAIN_SAMPLER, 0,
+		OUT_RELOC_PIXMAP(pixmap, I915_GEM_DOMAIN_SAMPLER, 0,
 				 TM0S0_USE_FENCE);
-		OUT_BATCH(((pPix->drawable.height -
-			    1) << TM0S1_HEIGHT_SHIFT) | ((pPix->drawable.width -
+		OUT_BATCH(((pixmap->drawable.height -
+			    1) << TM0S1_HEIGHT_SHIFT) | ((pixmap->drawable.width -
 							  1) <<
 							 TM0S1_WIDTH_SHIFT) |
 			  format);
diff --git a/src/i830_uxa.c b/src/i830_uxa.c
index a453c330..03d4b17e 100644
--- a/src/i830_uxa.c
+++ b/src/i830_uxa.c
@@ -86,13 +86,13 @@ static int uxa_pixmap_index;
  * buffer.  At the point where we are tiling some pixmaps managed by the
  * general allocator, we should move this to using pixmap privates.
  */
-Bool i830_pixmap_tiled(PixmapPtr pPixmap)
+Bool i830_pixmap_tiled(PixmapPtr pixmap)
 {
 	dri_bo *bo;
 	uint32_t tiling_mode, swizzle_mode;
 	int ret;
 
-	bo = i830_get_pixmap_bo(pPixmap);
+	bo = i830_get_pixmap_bo(pixmap);
 	assert(bo != NULL);
 
 	ret = drm_intel_bo_get_tiling(bo, &tiling_mode, &swizzle_mode);
@@ -142,37 +142,37 @@ static int i830_pixmap_pitch_is_aligned(PixmapPtr pixmap)
  * Sets up hardware state for a series of solid fills.
  */
 static Bool
-i830_uxa_prepare_solid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
+i830_uxa_prepare_solid(PixmapPtr pixmap, int alu, Pixel planemask, Pixel fg)
 {
-	ScrnInfoPtr scrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
+	ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	unsigned long pitch;
 	drm_intel_bo *bo_table[] = {
 		NULL,		/* batch_bo */
-		i830_get_pixmap_bo(pPixmap),
+		i830_get_pixmap_bo(pixmap),
 	};
 
-	if (!UXA_PM_IS_SOLID(&pPixmap->drawable, planemask))
+	if (!UXA_PM_IS_SOLID(&pixmap->drawable, planemask))
 		I830FALLBACK("planemask is not solid");
 
-	if (pPixmap->drawable.bitsPerPixel == 24)
+	if (pixmap->drawable.bitsPerPixel == 24)
 		I830FALLBACK("solid 24bpp unsupported!\n");
 
-	if (pPixmap->drawable.bitsPerPixel < 8)
+	if (pixmap->drawable.bitsPerPixel < 8)
 		I830FALLBACK("under 8bpp pixmaps unsupported\n");
 
-	i830_exa_check_pitch_2d(pPixmap);
+	i830_exa_check_pitch_2d(pixmap);
 
-	pitch = i830_pixmap_pitch(pPixmap);
+	pitch = i830_pixmap_pitch(pixmap);
 
-	if (!i830_pixmap_pitch_is_aligned(pPixmap))
+	if (!i830_pixmap_pitch_is_aligned(pixmap))
 		I830FALLBACK("pixmap pitch not aligned");
 
 	if (!i830_get_aperture_space(scrn, bo_table, ARRAY_SIZE(bo_table)))
 		return FALSE;
 
 	intel->BR[13] = (I830PatternROP[alu] & 0xff) << 16;
-	switch (pPixmap->drawable.bitsPerPixel) {
+	switch (pixmap->drawable.bitsPerPixel) {
 	case 8:
 		break;
 	case 16:
@@ -188,25 +188,25 @@ i830_uxa_prepare_solid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
 	return TRUE;
 }
 
-static void i830_uxa_solid(PixmapPtr pPixmap, int x1, int y1, int x2, int y2)
+static void i830_uxa_solid(PixmapPtr pixmap, int x1, int y1, int x2, int y2)
 {
-	ScrnInfoPtr scrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
+	ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	unsigned long pitch;
 	uint32_t cmd;
 
-	pitch = i830_pixmap_pitch(pPixmap);
+	pitch = i830_pixmap_pitch(pixmap);
 
 	{
 		BEGIN_BATCH(6);
 
 		cmd = XY_COLOR_BLT_CMD;
 
-		if (pPixmap->drawable.bitsPerPixel == 32)
+		if (pixmap->drawable.bitsPerPixel == 32)
 			cmd |=
 			    XY_COLOR_BLT_WRITE_ALPHA | XY_COLOR_BLT_WRITE_RGB;
 
-		if (IS_I965G(intel) && i830_pixmap_tiled(pPixmap)) {
+		if (IS_I965G(intel) && i830_pixmap_tiled(pixmap)) {
 			assert((pitch % 512) == 0);
 			pitch >>= 2;
 			cmd |= XY_COLOR_BLT_TILED;
@@ -217,16 +217,16 @@ static void i830_uxa_solid(PixmapPtr pPixmap, int x1, int y1, int x2, int y2)
 		OUT_BATCH(intel->BR[13] | pitch);
 		OUT_BATCH((y1 << 16) | (x1 & 0xffff));
 		OUT_BATCH((y2 << 16) | (x2 & 0xffff));
-		OUT_RELOC_PIXMAP(pPixmap, I915_GEM_DOMAIN_RENDER,
+		OUT_RELOC_PIXMAP(pixmap, I915_GEM_DOMAIN_RENDER,
 				 I915_GEM_DOMAIN_RENDER, 0);
 		OUT_BATCH(intel->BR[16]);
 		ADVANCE_BATCH();
 	}
 }
 
-static void i830_uxa_done_solid(PixmapPtr pPixmap)
+static void i830_uxa_done_solid(PixmapPtr pixmap)
 {
-	ScrnInfoPtr scrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
+	ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
 
 	i830_debug_sync(scrn);
 }
diff --git a/src/i830_video.c b/src/i830_video.c
index 329070d8..fe9b9bb2 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -1369,7 +1369,7 @@ i830_fill_colorkey(ScreenPtr pScreen, uint32_t key, RegionPtr clipboxes)
 }
 
 static void
-i830_wait_for_scanline(ScrnInfoPtr scrn, PixmapPtr pPixmap,
+i830_wait_for_scanline(ScrnInfoPtr scrn, PixmapPtr pixmap,
 		       xf86CrtcPtr crtc, RegionPtr clipBoxes)
 {
 	intel_screen_private *intel = intel_get_screen_private(scrn);
@@ -1377,7 +1377,7 @@ i830_wait_for_scanline(ScrnInfoPtr scrn, PixmapPtr pPixmap,
 	pixman_box16_t box_in_crtc_coordinates;
 	int pipe = -1, event, load_scan_lines_pipe;
 
-	if (pixmap_is_scanout(pPixmap))
+	if (pixmap_is_scanout(pixmap))
 		pipe = i830_crtc_to_pipe(crtc);
 
 	if (pipe >= 0) {
@@ -1604,7 +1604,7 @@ I830PutImage(ScrnInfoPtr scrn,
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
 	ScreenPtr pScreen = screenInfo.screens[scrn->scrnIndex];
-	PixmapPtr pPixmap = get_drawable_pixmap(pDraw);;
+	PixmapPtr pixmap = get_drawable_pixmap(pDraw);;
 	INT32 x1, x2, y1, y2;
 	int dstPitch;
 	int dstPitch2 = 0;
@@ -1675,7 +1675,7 @@ I830PutImage(ScrnInfoPtr scrn,
 		}
 	} else {
 		if (crtc && pPriv->SyncToVblank != 0) {
-			i830_wait_for_scanline(scrn, pPixmap, crtc, clipBoxes);
+			i830_wait_for_scanline(scrn, pixmap, crtc, clipBoxes);
 		}
 
 		if (IS_I965G(intel)) {
@@ -1690,13 +1690,13 @@ I830PutImage(ScrnInfoPtr scrn,
 			I965DisplayVideoTextured(scrn, pPriv, id, clipBoxes,
 						 width, height, dstPitch, x1,
 						 y1, x2, y2, src_w, src_h,
-						 drw_w, drw_h, pPixmap);
+						 drw_w, drw_h, pixmap);
 		} else {
 			I915DisplayVideoTextured(scrn, pPriv, id, clipBoxes,
 						 width, height, dstPitch,
 						 dstPitch2, x1, y1, x2, y2,
 						 src_w, src_h, drw_w, drw_h,
-						 pPixmap);
+						 pixmap);
 		}
 
 		DamageDamageRegion(pDraw, clipBoxes);
diff --git a/src/i830_video.h b/src/i830_video.h
index 40aeb576..f2b5178c 100644
--- a/src/i830_video.h
+++ b/src/i830_video.h
@@ -73,14 +73,14 @@ void I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv,
 			      short height, int video_pitch, int video_pitch2,
 			      int x1, int y1, int x2, int y2,
 			      short src_w, short src_h,
-			      short drw_w, short drw_h, PixmapPtr pPixmap);
+			      short drw_w, short drw_h, PixmapPtr pixmap);
 
 void I965DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv,
 			      int id, RegionPtr dstRegion, short width,
 			      short height, int video_pitch,
 			      int x1, int y1, int x2, int y2,
 			      short src_w, short src_h,
-			      short drw_w, short drw_h, PixmapPtr pPixmap);
+			      short drw_w, short drw_h, PixmapPtr pixmap);
 
 void I830VideoBlockHandler(int i, pointer blockData, pointer pTimeout,
 			   pointer pReadmask);
diff --git a/src/i915_render.c b/src/i915_render.c
index 7aad1621..0a9c1e02 100644
--- a/src/i915_render.c
+++ b/src/i915_render.c
@@ -237,7 +237,7 @@ i915_check_composite(int op, PicturePtr source_picture, PicturePtr mask_picture,
 	return TRUE;
 }
 
-static Bool i915_texture_setup(PicturePtr picture, PixmapPtr pPix, int unit)
+static Bool i915_texture_setup(PicturePtr picture, PixmapPtr pixmap, int unit)
 {
 	ScrnInfoPtr scrn = xf86Screens[picture->pDrawable->pScreen->myNum];
 	intel_screen_private *intel = intel_get_screen_private(scrn);
@@ -245,11 +245,11 @@ static Bool i915_texture_setup(PicturePtr picture, PixmapPtr pPix, int unit)
 	int w, h, i;
 	uint32_t wrap_mode;
 
-	pitch = intel_get_pixmap_pitch(pPix);
+	pitch = intel_get_pixmap_pitch(pixmap);
 	w = picture->pDrawable->width;
 	h = picture->pDrawable->height;
-	intel->scale_units[unit][0] = pPix->drawable.width;
-	intel->scale_units[unit][1] = pPix->drawable.height;
+	intel->scale_units[unit][0] = pixmap->drawable.width;
+	intel->scale_units[unit][1] = pixmap->drawable.height;
 
 	for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
 	     i++) {
@@ -295,8 +295,8 @@ static Bool i915_texture_setup(PicturePtr picture, PixmapPtr pPix, int unit)
 	intel->mapstate[unit * 3 + 0] = 0;
 	intel->mapstate[unit * 3 + 1] = format |
 	    MS3_USE_FENCE_REGS |
-	    ((pPix->drawable.height - 1) << MS3_HEIGHT_SHIFT) |
-	    ((pPix->drawable.width - 1) << MS3_WIDTH_SHIFT);
+	    ((pixmap->drawable.height - 1) << MS3_HEIGHT_SHIFT) |
+	    ((pixmap->drawable.width - 1) << MS3_WIDTH_SHIFT);
 	intel->mapstate[unit * 3 + 2] = ((pitch / 4) - 1) << MS4_PITCH_SHIFT;
 
 	intel->samplerstate[unit * 3 + 0] = (MIPFILTER_NONE <<
diff --git a/src/i915_video.c b/src/i915_video.c
index 2b805e49..19c5756d 100644
--- a/src/i915_video.c
+++ b/src/i915_video.c
@@ -45,7 +45,7 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
 			 short width, short height, int video_pitch,
 			 int video_pitch2, int x1, int y1, int x2, int y2,
 			 short src_w, short src_h, short drw_w, short drw_h,
-			 PixmapPtr pPixmap)
+			 PixmapPtr pixmap)
 {
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	uint32_t format, ms3, s5;
@@ -83,12 +83,12 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
 
 		/* draw rect -- just clipping */
 		OUT_BATCH(_3DSTATE_DRAW_RECT_CMD);
-		OUT_BATCH(DRAW_DITHER_OFS_X(pPixmap->drawable.x & 3) |
-			  DRAW_DITHER_OFS_Y(pPixmap->drawable.y & 3));
+		OUT_BATCH(DRAW_DITHER_OFS_X(pixmap->drawable.x & 3) |
+			  DRAW_DITHER_OFS_Y(pixmap->drawable.y & 3));
 		OUT_BATCH(0x00000000);	/* ymin, xmin */
 		/* ymax, xmax */
-		OUT_BATCH((pPixmap->drawable.width - 1) |
-			  (pPixmap->drawable.height - 1) << 16);
+		OUT_BATCH((pixmap->drawable.width - 1) |
+			  (pixmap->drawable.height - 1) << 16);
 		OUT_BATCH(0x00000000);	/* yorigin, xorigin */
 		OUT_BATCH(MI_NOOP);
 
@@ -130,8 +130,8 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
 		/* front buffer, pitch, offset */
 		OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
 		OUT_BATCH(BUF_3D_ID_COLOR_BACK | BUF_3D_USE_FENCE |
-			  BUF_3D_PITCH(intel_get_pixmap_pitch(pPixmap)));
-		OUT_RELOC_PIXMAP(pPixmap, I915_GEM_DOMAIN_RENDER,
+			  BUF_3D_PITCH(intel_get_pixmap_pitch(pixmap)));
+		OUT_RELOC_PIXMAP(pixmap, I915_GEM_DOMAIN_RENDER,
 				 I915_GEM_DOMAIN_RENDER, 0);
 		ADVANCE_BATCH();
 
@@ -396,8 +396,8 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
 		 * (in screen coordinates) to the backing pixmap.
 		 */
 #ifdef COMPOSITE
-		pix_xoff = -pPixmap->screen_x + pPixmap->drawable.x;
-		pix_yoff = -pPixmap->screen_y + pPixmap->drawable.y;
+		pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
+		pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
 #else
 		pix_xoff = 0;
 		pix_yoff = 0;
diff --git a/src/i965_render.c b/src/i965_render.c
index 9ad9d2b0..f0aaa3dc 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -1021,12 +1021,12 @@ static sampler_state_extend_t sampler_state_extend_from_picture(int repeat_type)
  */
 static void
 i965_set_picture_surface_state(dri_bo * ss_bo, int ss_index,
-			       PicturePtr picture, PixmapPtr pPixmap,
+			       PicturePtr picture, PixmapPtr pixmap,
 			       Bool is_dst)
 {
 	struct brw_surface_state_padded *ss;
 	struct brw_surface_state local_ss;
-	dri_bo *pixmap_bo = i830_get_pixmap_bo(pPixmap);
+	dri_bo *pixmap_bo = i830_get_pixmap_bo(pixmap);
 
 	ss = (struct brw_surface_state_padded *)ss_bo->virtual + ss_index;
 
@@ -1060,11 +1060,11 @@ i965_set_picture_surface_state(dri_bo * ss_bo, int ss_index,
 
 	local_ss.ss2.mip_count = 0;
 	local_ss.ss2.render_target_rotation = 0;
-	local_ss.ss2.height = pPixmap->drawable.height - 1;
-	local_ss.ss2.width = pPixmap->drawable.width - 1;
-	local_ss.ss3.pitch = intel_get_pixmap_pitch(pPixmap) - 1;
+	local_ss.ss2.height = pixmap->drawable.height - 1;
+	local_ss.ss2.width = pixmap->drawable.width - 1;
+	local_ss.ss3.pitch = intel_get_pixmap_pitch(pixmap) - 1;
 	local_ss.ss3.tile_walk = 0;	/* Tiled X */
-	local_ss.ss3.tiled_surface = i830_pixmap_tiled(pPixmap) ? 1 : 0;
+	local_ss.ss3.tiled_surface = i830_pixmap_tiled(pixmap) ? 1 : 0;
 
 	memcpy(ss, &local_ss, sizeof(local_ss));
 
diff --git a/src/i965_video.c b/src/i965_video.c
index d313e6cf..f9aacc7b 100644
--- a/src/i965_video.c
+++ b/src/i965_video.c
@@ -982,7 +982,7 @@ I965DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
 			 short width, short height, int video_pitch,
 			 int x1, int y1, int x2, int y2,
 			 short src_w, short src_h,
-			 short drw_w, short drw_h, PixmapPtr pPixmap)
+			 short drw_w, short drw_h, PixmapPtr pixmap)
 {
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	BoxPtr pbox;
@@ -1054,7 +1054,7 @@ I965DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
 	 */
 
 	/* Upload kernels */
-	surf_bos[0] = i965_create_dst_surface_state(scrn, pPixmap);
+	surf_bos[0] = i965_create_dst_surface_state(scrn, pixmap);
 	if (!surf_bos[0])
 		return;
 
@@ -1145,8 +1145,8 @@ I965DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
 	 * coordinates) to the backing pixmap.
 	 */
 #ifdef COMPOSITE
-	pix_xoff = -pPixmap->screen_x + pPixmap->drawable.x;
-	pix_yoff = -pPixmap->screen_y + pPixmap->drawable.y;
+	pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
+	pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
 #else
 	pix_xoff = 0;
 	pix_yoff = 0;