From 964eeac6dc2209da6aa8861aa8b0bc028700ab3d Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 10 Jun 2010 09:38:19 +1000 Subject: fix for server 1.9 --- src/nv_driver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/nv_driver.c') 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; -- cgit v1.2.3