diff options
| author | Marcin Kościelnicki <koriakin@0x04.net> | 2010-02-09 20:51:17 +0000 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2010-02-10 12:38:54 +0100 |
| commit | b16792b553dee41fc81d74c6e453832807e36368 (patch) | |
| tree | 12654e5f21b91bf41101eeee7e03bfc553e0ba5c | |
| parent | c56bce93f120d0ff18895149d1984896372cdd60 (diff) | |
Remove some UMS leftovers.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| -rw-r--r-- | src/nv_driver.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/nv_driver.c b/src/nv_driver.c index 248a151..7abd0dc 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -315,8 +315,6 @@ NVAdjustFrame(int scrnIndex, int x, int y, int flags) /* * This is called when VT switching back to the X server. Its job is * to reinitialise the video mode. - * - * We may wish to unmap video/MMIO memory too. */ /* Mandatory */ @@ -333,9 +331,6 @@ NVEnterVT(int scrnIndex, int flags) if (ret) ErrorF("Unable to get master: %d\n", ret); - if (!pNv->NoAccel) - NVAccelCommonInit(pScrn); - pNv->allow_dpms = FALSE; if (!xf86SetDesiredModes(pScrn)) return FALSE; @@ -350,8 +345,6 @@ NVEnterVT(int scrnIndex, int flags) /* * This is called when VT switching away from the X server. Its job is * to restore the previous (text) mode. - * - * We may wish to remap video/MMIO memory too. */ /* Mandatory */ @@ -595,12 +588,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) i = pEnt->index; xfree(pEnt); - if (xf86LoadSubModule(pScrn, "vbe")) { - vbeInfoPtr pVbe = VBEInit(NULL, i); - ConfiguredMonitor = vbeDoEDID(pVbe, NULL); - vbeFree(pVbe); - } - return TRUE; } @@ -733,11 +720,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) xf86GetVisualName(pScrn->defaultVisual), pScrn->depth); } - /* The vgahw module should be loaded here when needed */ - if (!xf86LoadSubModule(pScrn, "vgahw")) { - NVPreInitFail("\n"); - } - /* We use a programmable clock */ pScrn->progClock = TRUE; @@ -905,7 +887,7 @@ NVMapMem(ScrnInfoPtr pScrn) } /* - * Unmap the framebuffer and MMIO memory. + * Unmap the framebuffer and offscreen memory. */ static Bool |