diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2007-04-02 01:37:38 -0700 |
|---|---|---|
| committer | root <root@treble.(none)> | 2007-04-02 01:37:38 -0700 |
| commit | 5c03bd8acfcc814890fb13c891be4f135ea800d4 (patch) | |
| tree | 591254322ffe71d2af282fdf5f17650049f196da /src/g80_driver.c | |
| parent | 8f7769aadf175e8298f27387428214d6de49e6a5 (diff) | |
G80: Get HW cursor working with RandR 1.2.
Diffstat (limited to 'src/g80_driver.c')
| -rw-r--r-- | src/g80_driver.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/g80_driver.c b/src/g80_driver.c index 2a5fceb..6ab92ee 100644 --- a/src/g80_driver.c +++ b/src/g80_driver.c @@ -397,15 +397,11 @@ fail: static Bool AcquireDisplay(ScrnInfoPtr pScrn) { -// G80Ptr pNv = G80PTR(pScrn); - if(!G80DispInit(pScrn)) return FALSE; -#if 0 - if(!G80CursorAcquire(pNv)) - return FALSE; - if(!G80DispSetMode(pScrn, pScrn->currentMode)) + if(!G80CursorAcquire(pScrn)) return FALSE; +#if 0 G80DispDPMSSet(pScrn, DPMSModeOn, 0); #endif xf86SetDesiredModes(pScrn); @@ -421,9 +417,7 @@ ReleaseDisplay(ScrnInfoPtr pScrn) { G80Ptr pNv = G80PTR(pScrn); -#if 0 - G80CursorRelease(pNv); -#endif + G80CursorRelease(pScrn); G80DispShutdown(pScrn); if(pNv->int10 && pNv->int10Mode) { @@ -451,10 +445,7 @@ G80CloseScreen(int scrnIndex, ScreenPtr pScreen) if(pNv->xaa) XAADestroyInfoRec(pNv->xaa); -#if 0 - if(pNv->HWCursor) - xf86DestroyCursorInfoRec(pNv->CursorInfo); -#endif + xf86_cursors_fini(pScreen); if(xf86ServerIsExiting()) { if(pNv->int10) xf86FreeInt10(pNv->int10); @@ -795,13 +786,11 @@ G80ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); /* Initialize hardware cursor. Must follow software cursor initialization. */ -#if 0 if(pNv->HWCursor && !G80CursorInit(pScreen)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Hardware cursor initialization failed\n"); pNv->HWCursor = FALSE; } -#endif /* Initialize default colormap */ if(!miCreateDefColormap(pScreen)) |