mirror of
https://github.com/X11Libre/xf86-video-i740.git
synced 2026-03-24 01:24:56 +00:00
i740: convert to new X server screen conv api.
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
@@ -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();
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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"); /* ### */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user