diff options
| author | Eric Anholt <eric@anholt.net> | 2007-08-16 09:23:09 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-08-16 09:23:09 -0700 |
| commit | 0055fd5c35306a6363b0414f7f2220b3d1c27ecc (patch) | |
| tree | 40178e87d98efeb4bd9e0030b989a31e2090b9c9 /linux-core/nouveau_sgdma.c | |
| parent | 3a0bc518e35c62bb9c64c9105f836584d949653f (diff) | |
| parent | 02c4e0e757b69cd6ae38b8ab2c078b3f06fea661 (diff) | |
Merge branch 'master' into bo-set-pin
Diffstat (limited to 'linux-core/nouveau_sgdma.c')
| -rw-r--r-- | linux-core/nouveau_sgdma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/nouveau_sgdma.c b/linux-core/nouveau_sgdma.c index 0ddac952..df970d11 100644 --- a/linux-core/nouveau_sgdma.c +++ b/linux-core/nouveau_sgdma.c @@ -69,7 +69,7 @@ nouveau_sgdma_clear(struct drm_ttm_backend *be) if (nvbe->is_bound) be->func->unbind(be); - for (d = 0; d < nvbe->pages_populated; d--) { + for (d = 0; d < nvbe->pages_populated; d++) { pci_unmap_page(nvbe->dev->pdev, nvbe->pagelist[d], NV_CTXDMA_PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); @@ -211,7 +211,7 @@ nouveau_sgdma_init(struct drm_device *dev) obj_size = (aper_size >> NV_CTXDMA_PAGE_SHIFT) * 8; } - if ((ret = nouveau_gpuobj_new(dev, -1, obj_size, 16, + if ((ret = nouveau_gpuobj_new(dev, NULL, obj_size, 16, NVOBJ_FLAG_ALLOW_NO_REFS | NVOBJ_FLAG_ZERO_ALLOC | NVOBJ_FLAG_ZERO_FREE, &gpuobj))) { |