diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-08-07 09:14:39 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-08-07 09:18:12 +1000 |
| commit | 5cebdabdaa66a8e512a73fa16f30521457079b28 (patch) | |
| tree | 61d258f3e19b2cbfd5a3f5d58666b154600065bf /src/xgi_dga.c | |
| parent | eaaf5dd373ab36491ac719f1408f1f4e2f7eb4f4 (diff) | |
xgi: convert to new server compat API
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/xgi_dga.c')
| -rwxr-xr-x | src/xgi_dga.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/xgi_dga.c b/src/xgi_dga.c index 66e0319..3b798d7 100755 --- a/src/xgi_dga.c +++ b/src/xgi_dga.c @@ -193,7 +193,7 @@ SECOND_PASS: Bool XGIDGAInit(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); XGIPtr pXGI = XGIPTR(pScrn); DGAModePtr modes = NULL; int num = 0; @@ -260,8 +260,8 @@ XGI_SetMode( pScrn->currentMode = pXGI->CurrentLayout.mode; - (*pScrn->SwitchMode)(index, pScrn->currentMode, 0); - (*pScrn->AdjustFrame)(index, pScrn->frameX0, pScrn->frameY0, 0); + (*pScrn->SwitchMode)(SWITCH_MODE_ARGS(pScrn, pScrn->currentMode)); + (*pScrn->AdjustFrame)(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); pXGI->DGAactive = FALSE; } else { /* set new mode */ @@ -276,10 +276,10 @@ XGI_SetMode( pXGI->CurrentLayout.depth = pMode->depth; pXGI->CurrentLayout.displayWidth = pMode->bytesPerScanline / (pMode->bitsPerPixel >> 3); - (*pScrn->SwitchMode)(index, pMode->mode, 0); + (*pScrn->SwitchMode)(SWITCH_MODE_ARGS(pScrn, pMode->mode)); /* TW: Adjust viewport to 0/0 after mode switch */ /* This should fix the vmware-in-dualhead problems */ - (*pScrn->AdjustFrame)(index, 0, 0, 0); + (*pScrn->AdjustFrame)(ADJUST_FRAME_ARGS(pScrn, 0, 0)); } return TRUE; @@ -297,7 +297,7 @@ XGI_GetViewport(ScrnInfoPtr pScrn) static void XGI_SetViewport(ScrnInfoPtr pScrn, int x, int y, int flags) { - (*pScrn->AdjustFrame)(pScrn->pScreen->myNum, x, y, flags); + (*pScrn->AdjustFrame)(ADJUST_FRAME_ARGS(pScrn, x, y)); } static void |