summaryrefslogtreecommitdiff
path: root/src/nv_driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nv_driver.c')
-rw-r--r--src/nv_driver.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/nv_driver.c b/src/nv_driver.c
index ac5d27b..7b234ce 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -2201,9 +2201,15 @@ NVScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
/* Initialize HW cursor layer.
Must follow software cursor initialization*/
if (pNv->HWCursor) {
- if(!NVCursorInit(pScreen))
+ if (pNv->Architecture < NV_ARCH_50)
+ ret = NVCursorInit(pScreen);
+ else
+ ret = NV50CursorInit(pScreen);
+ if (ret != TRUE) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Hardware cursor initialization failed\n");
+ pNv->HWCursor = FALSE;
+ }
}
/* Initialise default colourmap */