diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-05-18 13:26:51 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-05-18 13:26:51 +1000 |
| commit | a694147ddc4e291d56c25907f90dd14bfb20ec14 (patch) | |
| tree | 243a18ab0d172c04827bab21ada1b134d0f1ecc2 | |
| parent | 035d1313d59f5d564701e58e1a2c84016a3afe22 (diff) | |
| download | xorg-driver-xf86-video-nouveau-a694147ddc4e291d56c25907f90dd14bfb20ec14.tar.gz | |
NV50: hook up hwcursor init
| -rw-r--r-- | src/nv_driver.c | 8 |
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 */ |