diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2007-03-19 12:00:36 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2007-03-19 12:00:36 -0700 |
| commit | 16f51977d49e52079754b62f4a13754e56da1c9c (patch) | |
| tree | 6ca79ce805439762d9abcac9ee908a536011f275 | |
| parent | ac84f228de689c6cb85eae827ec2443fabe67786 (diff) | |
NVSync hangs in EnterVT, so don't call it there.
| -rw-r--r-- | src/nv_driver.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nv_driver.c b/src/nv_driver.c index 4b07505..8ab76f6 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -816,7 +816,10 @@ NVProbe(DriverPtr drv, int flags) Bool NVSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) { - return NVModeInit(xf86Screens[scrnIndex], mode); + ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + + NVSync(pScrn); + return NVModeInit(pScrn, mode); } /* @@ -1736,8 +1739,6 @@ NVModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) NVPtr pNv = NVPTR(pScrn); NVRegPtr nvReg; - NVSync(pScrn); - /* Initialise the ModeReg values */ if (!vgaHWInit(pScrn, mode)) return FALSE; |