diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-05-25 12:08:41 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-05-25 12:08:41 +1000 |
| commit | d18dd08148bb8da67e9b58fcc182cc639d9cb355 (patch) | |
| tree | f2dd304ce6c294d30aeb0791d099ffb8b3b1ce4b | |
| parent | 8e13c54d01d2542e61721f315bff9b865e4fa3f8 (diff) | |
| download | xorg-driver-xf86-video-nouveau-d18dd08148bb8da67e9b58fcc182cc639d9cb355.tar.gz | |
NV50: Make sure CLUT gets initialised during ScreenInit
| -rw-r--r-- | src/nv_driver.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nv_driver.c b/src/nv_driver.c index 0ca7571..0f47a0a 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -916,6 +916,8 @@ NVEnterVT(int scrnIndex, int flags) NVPtr pNv = NVPTR(pScrn); int i; + pScrn->vtSema = TRUE; + if (pNv->Architecture == NV_ARCH_50) { if (!NV50AcquireDisplay(pScrn)) return FALSE; @@ -928,8 +930,6 @@ NVEnterVT(int scrnIndex, int flags) NVSave(pScrn); } - pScrn->vtSema = TRUE; - NVResetCrtcConfig(pScrn, 0); if (!xf86SetDesiredModes(pScrn)) return FALSE; @@ -2007,6 +2007,7 @@ NV50LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, unsigned short red, green, blue, unused; } *lut = (void *) pNv->CLUT->map; + ErrorF("NV50LoadPalette\n"); switch (pScrn->depth) { case 15: for (i = 0; i < numColors; i++) { |