diff options
| author | Brent Cook <busterbcook@yahoo.com> | 2004-04-12 02:23:11 +0000 |
|---|---|---|
| committer | Brent Cook <busterbcook@yahoo.com> | 2004-04-12 02:23:11 +0000 |
| commit | f16f729ea1286e7f5faa0147cd180006b6f965c2 (patch) | |
| tree | f5b3934f6103cbd86bdf3a18ded9d417fca97cd8 | |
| parent | 1ee3b0193d367a880669c0cae88cbf180f9a73e1 (diff) | |
Some little debugging additions; this works well with my NM2200 whenbcook-backend
acceleration is turned off in fbdev mode, but hangs when acceleration
is on. Will merge this with HEAD and debug from there, since backend
seems in good shape.
| -rw-r--r-- | hw/kdrive/neomagic/backend.c | 2 | ||||
| -rw-r--r-- | hw/kdrive/neomagic/neomagic.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/hw/kdrive/neomagic/backend.c b/hw/kdrive/neomagic/backend.c index 3fb502d71..dd360a80b 100644 --- a/hw/kdrive/neomagic/backend.c +++ b/hw/kdrive/neomagic/backend.c @@ -22,6 +22,7 @@ backendInitialize(KdCardInfo *card, BackendCard *backend) #ifdef KDRIVEFBDEV if (!success && fbdevInitialize(card, &backend->priv.fbdev)) { success = TRUE; + ErrorF("Using fbdev backend\n"); backend->type = FBDEV; backend->cardfini = fbdevCardFini; backend->scrfini = fbdevScreenFini; @@ -40,6 +41,7 @@ backendInitialize(KdCardInfo *card, BackendCard *backend) #ifdef KDRIVEVESA if (!success && vesaInitialize(card, &backend->priv.vesa)) { success = TRUE; + ErrorF("Using vesa backend\n"); backend->type = VESA; backend->cardfini = vesaCardFini; backend->scrfini = vesaScreenFini; diff --git a/hw/kdrive/neomagic/neomagic.c b/hw/kdrive/neomagic/neomagic.c index b4c08f0c7..11da76932 100644 --- a/hw/kdrive/neomagic/neomagic.c +++ b/hw/kdrive/neomagic/neomagic.c @@ -100,6 +100,8 @@ neoScreenInit(KdScreenInfo *screen) return FALSE; } + screen->driver = neos; + if(!backendScreenInitialize(screen, &neos->backendScreen, &neoc->backendCard)) { xfree(neos); return FALSE; @@ -136,8 +138,6 @@ neoScreenInit(KdScreenInfo *screen) neos->off_screen_size = 0; } - screen->driver = neos; - LEAVE(); return TRUE; } @@ -149,8 +149,8 @@ neoInitScreen(ScreenPtr pScreen) KdScreenPriv(pScreen); neoCardInfo(pScreenPriv); - return neoc->backendCard.initScreen(pScreen); LEAVE(); + return neoc->backendCard.initScreen(pScreen); } static Bool |