diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-07-12 11:55:47 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-07-12 11:55:47 +1000 |
| commit | af317f1cc7136dbf03b39ced64c42202703c5066 (patch) | |
| tree | c799d2bad309858310b5aa539fb1329009d2f5bf /shared-core | |
| parent | 522a0c868c79b48c5434f39faab1a02ca4425a90 (diff) | |
nouveau: mem_alloc() returns offsets, not absolute addresses now.
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/nouveau_object.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/shared-core/nouveau_object.c b/shared-core/nouveau_object.c index e8ed708f..16b38e95 100644 --- a/shared-core/nouveau_object.c +++ b/shared-core/nouveau_object.c @@ -646,6 +646,8 @@ nouveau_gpuobj_dma_new(drm_device_t *dev, int channel, int class, class)); INSTANCE_WR(*gpuobj, 1, size-1); + offset += dev->sg->virtual; + /*write starting at the third dword*/ instance_offset = 2; @@ -921,7 +923,7 @@ nouveau_gpuobj_channel_init(drm_device_t *dev, int channel, /*PCI*/ if((ret = nouveau_gpuobj_dma_new(dev, channel, NV_CLASS_DMA_IN_MEMORY, - dev->sg->virtual, dev->sg->pages * PAGE_SIZE, + 0, dev->sg->pages * PAGE_SIZE, NV_DMA_ACCESS_RW, NV_DMA_TARGET_PCI_NONLINEAR, &tt))) { DRM_ERROR("Error creating PCI TT ctxdma: %d\n", DRM_ERR(ENOMEM)); |