diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-03-21 18:27:21 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-03-21 18:27:21 +1100 |
| commit | dfe6500af823d6ac003ad793d13cb3929c62423d (patch) | |
| tree | 5b84421178c96aadfddb684134147f6d5c762c6e | |
| parent | c3c4cb0a0791e722af1cbb1841a84e4a70fcb0af (diff) | |
| parent | 23fdec37c580c3b5de263dfd48bd80fa9f21bc19 (diff) | |
| download | xorg-driver-xf86-video-nouveau-dfe6500af823d6ac003ad793d13cb3929c62423d.tar.gz | |
Merge branch 'origin' into randr-1.2-origin
| -rw-r--r-- | src/nv_accel_common.c | 1 | ||||
| -rw-r--r-- | src/nv_dma.c | 18 | ||||
| -rw-r--r-- | src/nv_dri.c | 2 |
3 files changed, 12 insertions, 9 deletions
diff --git a/src/nv_accel_common.c b/src/nv_accel_common.c index 3fc4332..76697a6 100644 --- a/src/nv_accel_common.c +++ b/src/nv_accel_common.c @@ -434,6 +434,7 @@ NVAccelCommonInit(ScrnInfoPtr pScrn) { NVPtr pNv = NVPTR(pScrn); Bool ret; + if(pNv->NoAccel) return TRUE; INIT_CONTEXT_OBJECT(NullObject); INIT_CONTEXT_OBJECT(DmaFB); diff --git a/src/nv_dma.c b/src/nv_dma.c index 04d7233..a612c9b 100644 --- a/src/nv_dma.c +++ b/src/nv_dma.c @@ -198,12 +198,13 @@ Bool NVDmaCreateDMAObject(NVPtr pNv, uint32_t handle, int class, drm_nouveau_dma_object_init_t dma; int ret; - dma.handle = handle; - dma.class = class; - dma.access = access; - dma.target = target; - dma.size = size; - dma.offset = offset; + dma.channel = pNv->fifo.channel; + dma.handle = handle; + dma.class = class; + dma.access = access; + dma.target = target; + dma.size = size; + dma.offset = offset; ret = drmCommandWrite(pNv->drm_fd, DRM_NOUVEAU_DMA_OBJECT_INIT, &dma, sizeof(dma)); @@ -323,8 +324,9 @@ Bool NVDmaCreateContextObject(NVPtr pNv, int handle, int class) drm_nouveau_object_init_t cto; int ret; - cto.handle = handle; - cto.class = class; + cto.channel = pNv->fifo.channel; + cto.handle = handle; + cto.class = class; ret = drmCommandWrite(pNv->drm_fd, DRM_NOUVEAU_OBJECT_INIT, &cto, sizeof(cto)); return ret == 0; diff --git a/src/nv_dri.c b/src/nv_dri.c index ec9f129..1eaf4b9 100644 --- a/src/nv_dri.c +++ b/src/nv_dri.c @@ -244,7 +244,7 @@ Bool NVDRIGetVersion(ScrnInfoPtr pScrn) } /* temporary lock step versioning */ -#if NOUVEAU_DRM_HEADER_PATCHLEVEL != 4 +#if NOUVEAU_DRM_HEADER_PATCHLEVEL != 5 #error nouveau_drm.h doesn't match expected patchlevel, update libdrm. #endif if (pNv->pKernelDRMVersion->version_patchlevel != |