diff options
Diffstat (limited to 'src/nv_accel_common.c')
| -rw-r--r-- | src/nv_accel_common.c | 84 |
1 files changed, 69 insertions, 15 deletions
diff --git a/src/nv_accel_common.c b/src/nv_accel_common.c index 51bb5a7..640dac6 100644 --- a/src/nv_accel_common.c +++ b/src/nv_accel_common.c @@ -16,6 +16,21 @@ NVAccelInitNullObject(ScrnInfoPtr pScrn) return TRUE; } +static Bool +NVAccelInitNull3D(ScrnInfoPtr pScrn) +{ + NVPtr pNv = NVPTR(pScrn); + static int have_object = FALSE; + + if (!have_object) { + if (!NVDmaCreateContextObject(pNv, Nv3D, 0x30)) + return FALSE; + have_object = TRUE; + } + + return TRUE; +} + uint32_t NVAccelGetPixmapOffset(PixmapPtr pPix) { @@ -374,7 +389,10 @@ NVAccelInitMemFormat(ScrnInfoPtr pScrn) static int have_object = FALSE; uint32_t class; - class = NV_MEMORY_TO_MEMORY_FORMAT; + if (pNv->Architecture < NV_ARCH_50) + class = NV_MEMORY_TO_MEMORY_FORMAT; + else + class = NV_MEMORY_TO_MEMORY_FORMAT | 0x5000; if (!have_object) { if (!NVDmaCreateContextObject(pNv, NvMemFormat, class)) @@ -395,6 +413,41 @@ NVAccelInitMemFormat(ScrnInfoPtr pScrn) return TRUE; } +static Bool +NVAccelInit2D_NV50(ScrnInfoPtr pScrn) +{ + NVPtr pNv = NVPTR(pScrn); + static int have_object = FALSE; + + if (!have_object) { + if (!NVDmaCreateContextObject(pNv, Nv2D, 0x502d)) + return FALSE; + have_object = TRUE; + } + + NVDmaSetObjectOnSubchannel(pNv, NvSub2D, Nv2D); + + NVDmaStart(pNv, NvSub2D, 0x180, 3); + NVDmaNext (pNv, NvDmaNotifier0); + NVDmaNext (pNv, NvDmaFB); + NVDmaNext (pNv, NvDmaFB); + + /* Magics from nv, no clue what they do, but at least some + * of them are needed to avoid crashes. + */ + NVDmaStart(pNv, NvSub2D, 0x260, 1); + NVDmaNext (pNv, 1); + NVDmaStart(pNv, NvSub2D, 0x290, 1); + NVDmaNext (pNv, 1); + NVDmaStart(pNv, NvSub2D, 0x29c, 1); + NVDmaNext (pNv, 0); + NVDmaStart(pNv, NvSub2D, 0x58c, 1); + NVDmaNext (pNv, 0x111); + + pNv->currentRop = 0xfffffffa; + return TRUE; +} + #define INIT_CONTEXT_OBJECT(name) do { \ ret = NVAccelInit##name(pScrn); \ if (!ret) { \ @@ -410,31 +463,32 @@ NVAccelCommonInit(ScrnInfoPtr pScrn) { NVPtr pNv = NVPTR(pScrn); Bool ret; - if(pNv->NoAccel) return TRUE; INIT_CONTEXT_OBJECT(NullObject); INIT_CONTEXT_OBJECT(DmaNotifier0); - INIT_CONTEXT_OBJECT(ContextSurfaces); - INIT_CONTEXT_OBJECT(ImagePattern); - INIT_CONTEXT_OBJECT(RasterOp); - INIT_CONTEXT_OBJECT(Rectangle); - INIT_CONTEXT_OBJECT(ImageBlit); - INIT_CONTEXT_OBJECT(ScaledImage); - - /* XAA-only */ - INIT_CONTEXT_OBJECT(ClipRectangle); - INIT_CONTEXT_OBJECT(SolidLine); - - /* EXA-only */ + /* 2D engine */ + if (pNv->Architecture < NV_ARCH_50) { + INIT_CONTEXT_OBJECT(ContextSurfaces); + INIT_CONTEXT_OBJECT(ImagePattern); + INIT_CONTEXT_OBJECT(RasterOp); + INIT_CONTEXT_OBJECT(Rectangle); + INIT_CONTEXT_OBJECT(ImageBlit); + INIT_CONTEXT_OBJECT(ScaledImage); + INIT_CONTEXT_OBJECT(ClipRectangle); + INIT_CONTEXT_OBJECT(SolidLine); + } else { + INIT_CONTEXT_OBJECT(2D_NV50); + } INIT_CONTEXT_OBJECT(MemFormat); - /* 3D init */ + /* 3D engine */ switch (pNv->Architecture) { case NV_ARCH_40: INIT_CONTEXT_OBJECT(NV40TCL); break; default: + INIT_CONTEXT_OBJECT(Null3D); break; } |