From 01bdd7d3d18f5d5c94aa99ccd7677f5928b37392 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 13 Jul 2012 14:56:12 +1000 Subject: apm: initial compat api Port to new server compat API. Signed-off-by: Dave Airlie --- src/apm_dga.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/apm_dga.c') diff --git a/src/apm_dga.c b/src/apm_dga.c index d250251..fa94006 100644 --- a/src/apm_dga.c +++ b/src/apm_dga.c @@ -243,8 +243,8 @@ ApmSetMode(ScrnInfoPtr pScrn, DGAModePtr pMode) } pScrn->currentMode = pApm->CurrentLayout.pMode; - ApmSwitchMode(index, pScrn->currentMode, 0); - ApmAdjustFrame(index, pScrn->frameX0, pScrn->frameY0, 0); + ApmSwitchMode(SWITCH_MODE_ARGS(pScrn, pScrn->currentMode)); + ApmAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); #if 0 if (pApm->AccelInfoRec) XAAInit(pScrn->pScreen, pApm->AccelInfoRec); @@ -269,7 +269,7 @@ ApmSetMode(ScrnInfoPtr pScrn, DGAModePtr pMode) else pApm->CurrentLayout.mask32 = 32 / pMode->bitsPerPixel - 1; - ApmSwitchMode(index, pMode->mode, 0); + ApmSwitchMode(SWITCH_MODE_ARGS(pScrn, pMode->mode)); ApmSetupXAAInfo(pApm, NULL); #if 0 @@ -321,7 +321,7 @@ ApmSetViewport( ApmWriteSeq(0x1C, 0x2F); pApm->apmLock = FALSE; } - pScrn->AdjustFrame(pScrn->pScreen->myNum, x, y, flags); + pScrn->AdjustFrame(ADJUST_FRAME_ARGS(pScrn, x, y)); if (pApm->VGAMap) { /* Wait until vertical retrace is in progress. */ while (APMVGAB(0x3DA) & 0x08); -- cgit v1.2.3