summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-07-17 14:52:33 +1000
committerDave Airlie <airlied@redhat.com>2012-07-17 14:52:33 +1000
commite3f81a683f3f5d3c70c4320568b756fb50bec527 (patch)
tree03b6822a3e6325e1bd8799265226b0d677127a97
parenta4b43ddf74966bff74e92b0d2bdd4573730d97a8 (diff)
i740: convert to new X server screen conv api.
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--src/i740_accel.c2
-rw-r--r--src/i740_cursor.c4
-rw-r--r--src/i740_dga.c2
-rw-r--r--src/i740_video.c8
4 files changed, 8 insertions, 8 deletions
diff --git a/src/i740_accel.c b/src/i740_accel.c
index 7d59ae6..de06e07 100644
--- a/src/i740_accel.c
+++ b/src/i740_accel.c
@@ -125,7 +125,7 @@ Bool
I740AccelInit(ScreenPtr pScreen) {
#ifdef HAVE_XAA_H
XAAInfoRecPtr infoPtr;
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
I740Ptr pI740 = I740PTR(pScrn);
pI740->AccelInfoRec = infoPtr = XAACreateInfoRec();
diff --git a/src/i740_cursor.c b/src/i740_cursor.c
index b61fc5b..8c8cc8f 100644
--- a/src/i740_cursor.c
+++ b/src/i740_cursor.c
@@ -61,7 +61,7 @@ I740CursorInit(ScreenPtr pScreen)
xf86CursorInfoPtr infoPtr;
FBAreaPtr fbarea;
- pScrn = xf86Screens[pScreen->myNum];
+ pScrn = xf86ScreenToScrn(pScreen);
pI740 = I740PTR(pScrn);
pI740->CursorInfoRec = infoPtr = xf86CreateCursorInfoRec();
if (!infoPtr) return FALSE;
@@ -117,7 +117,7 @@ I740UseHWCursor(ScreenPtr pScreen, CursorPtr pCurs) {
ScrnInfoPtr pScrn;
I740Ptr pI740;
- pScrn = xf86Screens[pScreen->myNum];
+ pScrn = xf86ScreenToScrn(pScreen);
pI740 = I740PTR(pScrn);
if (pScrn->currentMode->Flags&V_DBLSCAN)
return FALSE;
diff --git a/src/i740_dga.c b/src/i740_dga.c
index a81c16f..532d614 100644
--- a/src/i740_dga.c
+++ b/src/i740_dga.c
@@ -73,7 +73,7 @@ static DGAFunctionRec I740DGAFuncs = {
Bool I740DGAInit(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
I740Ptr pI740 = I740PTR(pScrn);
DGAModePtr modes = NULL, newmodes = NULL, currentMode;
DisplayModePtr pMode, firstMode;
diff --git a/src/i740_video.c b/src/i740_video.c
index 00c69af..fc2d137 100644
--- a/src/i740_video.c
+++ b/src/i740_video.c
@@ -598,7 +598,7 @@ static FBLinearPtr I740AllocateMemory(ScrnInfoPtr pScrn, FBLinearPtr linear, int
xf86FreeOffscreenLinear(linear);
}
- pScreen = screenInfo.screens[pScrn->scrnIndex];
+ pScreen = xf86ScrnToScreen(pScrn);
new_linear = xf86AllocateOffscreenLinear(pScreen, size, 4, NULL, NULL, NULL);
@@ -1122,7 +1122,7 @@ static void I740InitOffscreenImages(ScreenPtr pScreen)
{
XF86OffscreenImagePtr offscreenImages;
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "I740InitOffscreenImages entered\n"); /* ### */
}
@@ -1169,7 +1169,7 @@ static XF86VideoAdaptorPtr I740SetupImageVideo(ScreenPtr pScreen)
{15, TrueColor}, {16, TrueColor}, {24, TrueColor}, {8, PseudoColor}
};
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
I740Ptr pI740 = I740PTR(pScrn);
XF86VideoAdaptorPtr adapt;
I740PortPrivPtr pPriv;
@@ -1238,7 +1238,7 @@ static XF86VideoAdaptorPtr I740SetupImageVideo(ScreenPtr pScreen)
void I740InitVideo(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
XF86VideoAdaptorPtr newAdaptor = NULL;
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "I740InitVideo entered\n"); /* ### */