diff options
| author | Stephane Marchesin <marchesin@icps.u-strasbg.fr> | 2007-08-06 23:30:04 +0200 |
|---|---|---|
| committer | Stephane Marchesin <marchesin@icps.u-strasbg.fr> | 2007-08-06 23:30:04 +0200 |
| commit | 3f0a52c44697787d84d4f2cf61872e13d630f62a (patch) | |
| tree | dee124141d25452753f29d462be6ee743ad65301 | |
| parent | 17b65f1c2be3e609d387066d72dd8f5f7e2a6d92 (diff) | |
| download | xorg-driver-xf86-video-nouveau-3f0a52c44697787d84d4f2cf61872e13d630f62a.tar.gz | |
Fix explicit usage of subchannels, and remove subchannel defines altogether.
| -rw-r--r-- | src/nv_accel_common.c | 2 | ||||
| -rw-r--r-- | src/nv_dma.h | 17 |
2 files changed, 1 insertions, 18 deletions
diff --git a/src/nv_accel_common.c b/src/nv_accel_common.c index 06226f6..805d698 100644 --- a/src/nv_accel_common.c +++ b/src/nv_accel_common.c @@ -221,7 +221,7 @@ NVAccelInitRectangle(ScrnInfoPtr pScrn) NVDmaNext (pNv, NvImagePattern); NVDmaStart(pNv, NvRectangle, NV04_GDI_RECTANGLE_TEXT_OPERATION, 1); NVDmaNext (pNv, 1 /* ROP_AND */); - NVDmaStart(pNv, NvSubRectangle, + NVDmaStart(pNv, NvRectangle, 0x304 /*NV04_GDI_RECTANGLE_TEXT_MONO_FORMAT*/, 1); /* XXX why putting 1 like renouveau dump, swap the text */ #if 1 || X_BYTE_ORDER == X_BIG_ENDIAN diff --git a/src/nv_dma.h b/src/nv_dma.h index 8911cc4..3c51f1a 100644 --- a/src/nv_dma.h +++ b/src/nv_dma.h @@ -79,23 +79,6 @@ enum DMAObjects { NvDmaXvNotifier5 = 0xE8000005, }; -enum DMASubchannel { -/* EXA + XAA + Xv */ - NvSubContextSurfaces = 0, - NvSubRectangle = 1, - NvSubScaledImage = 2, -/* EXA + XAA */ - NvSubRop = 3, - NvSubImagePattern = 4, - NvSubImageBlit = 5, -/* EXA */ - NvSubMemFormat = 6, - NvSub3D = 7, -/* XAA */ - NvSubClipRectangle = 6, - NvSubSolidLine = 7, -}; - #define NVDmaNext(pNv, data) do { \ NVDEBUG("\tNVDmaNext: @0x%08x 0x%08x\n", ((pNv)->dmaCurrent),(data)); \ (pNv)->dmaBase[(pNv)->dmaCurrent++] = (data); \ |