diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-21 17:00:32 +0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-21 17:00:32 +0800 |
| commit | 8ba06464ac8de726390899e790e15b40df08001e (patch) | |
| tree | 8427cef9e66f329166b7cf366e09fa99e060f896 /src/mesa/drivers/dri/nouveau/nouveau_object.c | |
| parent | 76444d042c841aa4e060db46c0668c17da97a1f6 (diff) | |
| parent | 4b5d6c0435acd84c13e0db3785758fed0bc48fe1 (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nouveau_object.c')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_object.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_object.c b/src/mesa/drivers/dri/nouveau/nouveau_object.c index 468b18e6d9..b71acff430 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_object.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_object.c @@ -10,8 +10,9 @@ GLboolean nouveauCreateContextObject(nouveauContextPtr nmesa, drm_nouveau_object_init_t cto; int ret; - cto.handle = handle; - cto.class = class; + cto.channel = nmesa->fifo.channel; + cto.handle = handle; + cto.class = class; ret = drmCommandWrite(nmesa->driFd, DRM_NOUVEAU_OBJECT_INIT, &cto, sizeof(cto)); return ret == 0; @@ -28,12 +29,13 @@ GLboolean nouveauCreateDmaObject(nouveauContextPtr nmesa, drm_nouveau_dma_object_init_t dma; int ret; - dma.class = class; - dma.handle = handle; - dma.target = target; - dma.access = access; - dma.offset = offset; - dma.size = size; + dma.channel = nmesa->fifo.channel; + dma.class = class; + dma.handle = handle; + dma.target = target; + dma.access = access; + dma.offset = offset; + dma.size = size; ret = drmCommandWriteRead(nmesa->driFd, DRM_NOUVEAU_DMA_OBJECT_INIT, &dma, sizeof(dma)); return ret == 0; |