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, 29 insertions, 29 deletions

diff --git a/src/i830_dvo.c b/src/i830_dvo.c
index f817823f..3deb254b 100644
--- a/src/i830_dvo.c
+++ b/src/i830_dvo.c
@@ -84,8 +84,8 @@ static struct _I830DVODriver i830_dvo_drivers[] =
 static void
 i830_dvo_dpms(xf86OutputPtr output, int mode)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    intel_screen_private    *intel = intel_get_screen_private(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     struct _I830DVODriver   *drv = intel_output->i2c_drv;
     void *		    dev_priv = drv->dev_priv;
@@ -105,8 +105,8 @@ i830_dvo_dpms(xf86OutputPtr output, int mode)
 static void
 i830_dvo_save(xf86OutputPtr output)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    intel_screen_private    *intel = intel_get_screen_private(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     void *		    dev_priv = intel_output->i2c_drv->dev_priv;
 
@@ -123,8 +123,8 @@ i830_dvo_save(xf86OutputPtr output)
 static void
 i830_dvo_restore(xf86OutputPtr output)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    intel_screen_private    *intel = intel_get_screen_private(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     void *		    dev_priv = intel_output->i2c_drv->dev_priv;
 
@@ -138,8 +138,8 @@ i830_dvo_restore(xf86OutputPtr output)
 static int
 i830_dvo_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    intel_screen_private    *intel = intel_get_screen_private(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     void		    *dev_priv = intel_output->i2c_drv->dev_priv;
 
@@ -162,8 +162,8 @@ static Bool
 i830_dvo_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
 		    DisplayModePtr adjusted_mode)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    intel_screen_private    *intel = intel_get_screen_private(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
 
     /* If we have timings from the BIOS for the panel, put them in
@@ -194,8 +194,8 @@ static void
 i830_dvo_mode_set(xf86OutputPtr output, DisplayModePtr mode,
 		  DisplayModePtr adjusted_mode)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
-    intel_screen_private    *intel = intel_get_screen_private(pScrn);
+    ScrnInfoPtr		    scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     xf86CrtcPtr	    crtc = output->crtc;
     I830CrtcPrivatePtr	    intel_crtc = crtc->driver_private;
     I830OutputPrivatePtr    intel_output = output->driver_private;
@@ -262,8 +262,8 @@ i830_dvo_detect(xf86OutputPtr output)
 static DisplayModePtr
 i830_dvo_get_modes(xf86OutputPtr output)
 {
-    ScrnInfoPtr	pScrn = output->scrn;
-    intel_screen_private    *intel = intel_get_screen_private(pScrn);
+    ScrnInfoPtr	scrn = output->scrn;
+    intel_screen_private    *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr    intel_output = output->driver_private;
     DisplayModePtr	    modes;
 
@@ -310,13 +310,13 @@ i830_dvo_destroy (xf86OutputPtr output)
 static xf86CrtcPtr
 i830_dvo_get_crtc(xf86OutputPtr output)
 {
-    ScrnInfoPtr	pScrn = output->scrn;
-    intel_screen_private *intel = intel_get_screen_private(pScrn);
+    ScrnInfoPtr	scrn = output->scrn;
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr intel_output = output->driver_private;
     struct _I830DVODriver *drv = intel_output->i2c_drv;
     int pipe = !!(INREG(drv->dvo_reg) & SDVO_PIPE_B_SELECT);
    
-    return i830_pipe_to_crtc(pScrn, pipe);
+    return i830_pipe_to_crtc(scrn, pipe);
 }
 #endif
 
@@ -346,9 +346,9 @@ static const xf86OutputFuncsRec i830_dvo_output_funcs = {
 static DisplayModePtr
 i830_dvo_get_current_mode (xf86OutputPtr output)
 {
-    ScrnInfoPtr		    pScrn = output->scrn;
+    ScrnInfoPtr		    scrn = output->scrn;
     I830OutputPrivatePtr    intel_output = output->driver_private;
-    intel_screen_private *intel = intel_get_screen_private(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     struct _I830DVODriver   *drv = intel_output->i2c_drv;
     unsigned int	    dvo_reg = drv->dvo_reg;
     uint32_t		    dvo = INREG(dvo_reg);
@@ -359,7 +359,7 @@ i830_dvo_get_current_mode (xf86OutputPtr output)
      */
     if (dvo & DVO_ENABLE) 
     {
-	xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+	xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
 	int		    pipe = (dvo & DVO_PIPE_B_SELECT) ? 1 : 0;
 	int		    c;
 
@@ -370,7 +370,7 @@ i830_dvo_get_current_mode (xf86OutputPtr output)
 
 	    if (intel_crtc->pipe == pipe)
 	    {
-		mode = i830_crtc_mode_get(pScrn, crtc);
+		mode = i830_crtc_mode_get(scrn, crtc);
 
 		if (mode)
 		{
@@ -389,9 +389,9 @@ i830_dvo_get_current_mode (xf86OutputPtr output)
 }
 
 void
-i830_dvo_init(ScrnInfoPtr pScrn)
+i830_dvo_init(ScrnInfoPtr scrn)
 {
-    intel_screen_private *intel = intel_get_screen_private(pScrn);
+    intel_screen_private *intel = intel_get_screen_private(scrn);
     I830OutputPrivatePtr intel_output;
     int ret;
     int i;
@@ -405,7 +405,7 @@ i830_dvo_init(ScrnInfoPtr pScrn)
 	return;
 
     /* Set up the DDC bus */
-    ret = I830I2CInit(pScrn, &intel_output->pDDCBus, GPIOD, "DVODDC_D");
+    ret = I830I2CInit(scrn, &intel_output->pDDCBus, GPIOD, "DVODDC_D");
     if (!ret) {
 	xfree(intel_output);
 	return;
@@ -416,7 +416,7 @@ i830_dvo_init(ScrnInfoPtr pScrn)
 	int gpio;
 
 	drv = &i830_dvo_drivers[i];
-	drv->modhandle = xf86LoadSubModule(pScrn, drv->modulename);
+	drv->modhandle = xf86LoadSubModule(scrn, drv->modulename);
 	if (drv->modhandle == NULL)
 	    continue;
 
@@ -445,7 +445,7 @@ i830_dvo_init(ScrnInfoPtr pScrn)
 	if (gpio_inited != gpio) {
 	    if (pI2CBus != NULL)
 		xf86DestroyI2CBusRec(pI2CBus, TRUE, TRUE);
-	    if (!I830I2CInit(pScrn, &pI2CBus, gpio,
+	    if (!I830I2CInit(scrn, &pI2CBus, gpio,
 			     gpio == GPIOB ? "DVOI2C_B" : "DVOI2C_E")) {
 		continue;
 	    }
@@ -463,19 +463,19 @@ i830_dvo_init(ScrnInfoPtr pScrn)
 		intel_output->pipe_mask = ((1 << 0) | (1 << 1));
 		intel_output->clone_mask = ((1 << I830_OUTPUT_ANALOG) |
 					    (1 << I830_OUTPUT_DVO_TMDS));
-		output = xf86OutputCreate(pScrn, &i830_dvo_output_funcs,
+		output = xf86OutputCreate(scrn, &i830_dvo_output_funcs,
 					  "TMDS");
 		break;
 	    case I830_OUTPUT_DVO_LVDS:
 		intel_output->pipe_mask = ((1 << 0) | (1 << 1));
 		intel_output->clone_mask = (1 << I830_OUTPUT_DVO_LVDS);
-		output = xf86OutputCreate(pScrn, &i830_dvo_output_funcs,
+		output = xf86OutputCreate(scrn, &i830_dvo_output_funcs,
 					  "LVDS");
 		break;
 	    case I830_OUTPUT_DVO_TVOUT:
 		intel_output->pipe_mask = ((1 << 0) | (1 << 1));
 		intel_output->clone_mask = (1 << I830_OUTPUT_DVO_TVOUT);
-		output = xf86OutputCreate(pScrn, &i830_dvo_output_funcs,
+		output = xf86OutputCreate(scrn, &i830_dvo_output_funcs,
 					  "TV");
 		break;
 	    }