s3: fixup scrn/screen conversion.

Signed-off-by: Dave Airlie <airlied@redhat.com>

6 files changed, 10 insertions, 10 deletions

diff --git a/src/s3_IBMRGB.c b/src/s3_IBMRGB.c
index a9f8a20..bc1cd1c 100644
--- a/src/s3_IBMRGB.c
+++ b/src/s3_IBMRGB.c
@@ -511,7 +511,7 @@ static void S3IBMRGBLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *image)
 
 static Bool S3IBMRGBUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
 {
-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 	S3Ptr pS3 = S3PTR(pScrn);
 	return (pS3->hwCursor);
 }
@@ -519,7 +519,7 @@ static Bool S3IBMRGBUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
 
 Bool S3IBMRGB_CursorInit(ScreenPtr pScreen)
 {
-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 	S3Ptr pS3 = S3PTR(pScrn);
 	xf86CursorInfoPtr pCurs;
 
diff --git a/src/s3_Ti.c b/src/s3_Ti.c
index fd83bfb..bb0ce51 100644
--- a/src/s3_Ti.c
+++ b/src/s3_Ti.c
@@ -725,7 +725,7 @@ static void S3TiLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *image)
 
 static Bool S3TiUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
 {
-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 	S3Ptr pS3 = S3PTR(pScrn);
 	return (pS3->hwCursor);
 }       
@@ -734,7 +734,7 @@ static Bool S3TiUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
 
 Bool S3Ti_CursorInit(ScreenPtr pScreen)
 {
-        ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+        ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
         S3Ptr pS3 = S3PTR(pScrn);
         xf86CursorInfoPtr pCurs;      
         
diff --git a/src/s3_accel.c b/src/s3_accel.c
index a9cb9c9..5d11ac4 100644
--- a/src/s3_accel.c
+++ b/src/s3_accel.c
@@ -549,7 +549,7 @@ Bool S3AccelInitPIO(ScreenPtr pScreen)
 #endif
 {
 #ifdef HAVE_XAA_H
-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 	S3Ptr pS3 = S3PTR(pScrn);
 	XAAInfoRecPtr pXAA;
 
diff --git a/src/s3_cursor.c b/src/s3_cursor.c
index 1cb1c65..dec5f43 100644
--- a/src/s3_cursor.c
+++ b/src/s3_cursor.c
@@ -197,7 +197,7 @@ static void S3LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *image)
 
 static Bool S3UseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
 {
-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 	S3Ptr pS3 = S3PTR(pScrn);
 	return (pS3->hwCursor);
 }
@@ -205,7 +205,7 @@ static Bool S3UseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
 
 Bool S3_CursorInit(ScreenPtr pScreen)
 {
-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 	S3Ptr pS3 = S3PTR(pScrn);
 	xf86CursorInfoPtr pCurs;
 
diff --git a/src/s3_dga.c b/src/s3_dga.c
index 5b61d1c..e384c45 100644
--- a/src/s3_dga.c
+++ b/src/s3_dga.c
@@ -176,7 +176,7 @@ SECOND_PASS:
 
 Bool S3DGAInit(ScreenPtr pScreen)
 {
-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 	S3Ptr pS3 = S3PTR(pScrn);
 	DGAModePtr modes = NULL;
 	int num = 0;
diff --git a/src/s3_video.c b/src/s3_video.c
index f47bf20..998ce74 100644
--- a/src/s3_video.c
+++ b/src/s3_video.c
@@ -62,7 +62,7 @@ static FBLinearPtr S3XVMemAlloc(ScrnInfoPtr pScrn, pointer pVideo, int size);
 
 void S3InitVideo(ScreenPtr pScreen)
 {
-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 	S3Ptr pS3 = S3PTR(pScrn);
 	XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
 	XF86VideoAdaptorPtr newAdaptor = NULL;
@@ -238,7 +238,7 @@ static XF86VideoAdaptorPtr S3AllocAdaptor(ScrnInfoPtr pScrn)
 
 static XF86VideoAdaptorPtr S3SetupImageVideoOverlay(ScreenPtr pScreen)
 {
-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 	S3Ptr pS3 = S3PTR(pScrn);
 	XF86VideoAdaptorPtr adapt;