summaryrefslogtreecommitdiff
path: root/src/nv_driver.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-06-10 09:38:19 +1000
committerBen Skeggs <bskeggs@redhat.com>2010-06-10 09:51:04 +1000
commit964eeac6dc2209da6aa8861aa8b0bc028700ab3d (patch)
treecbeafbd0d0706ff4a3d2cfbf190d160e52ed66ae /src/nv_driver.c
parentc079408e287ad09e954fa3985f95912c02cf06bc (diff)
fix for server 1.9
Diffstat (limited to 'src/nv_driver.c')
-rw-r--r--src/nv_driver.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nv_driver.c b/src/nv_driver.c
index a0483df..d9c5115 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -389,6 +389,10 @@ NVCreateScreenResources(ScreenPtr pScreen)
return FALSE;
pScreen->CreateScreenResources = NVCreateScreenResources;
+ drmmode_fbcon_copy(pScreen);
+ if (!xf86SetDesiredModes(pScrn))
+ return FALSE;
+
if (!pNv->NoAccel) {
ppix = pScreen->GetScreenPixmap(pScreen);
nouveau_bo_ref(pNv->scanout, &nouveau_pixmap(ppix)->bo);
@@ -1138,10 +1142,6 @@ NVScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
pNv->BlockHandler = pScreen->BlockHandler;
pScreen->BlockHandler = NVBlockHandler;
- drmmode_fbcon_copy(pScreen);
-
- if (!NVEnterVT(pScrn->scrnIndex, 0))
- return FALSE;
pScrn->vtSema = TRUE;
pScrn->pScreen = pScreen;