summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-09-12 23:57:44 (GMT)
committerBen Skeggs <bskeggs@redhat.com>2010-09-24 06:26:31 (GMT)
commit17b20348ea94a92a54898c518b514c564d12e4c3 (patch)
treea242114d2e41dc50084f4d2b43bef69bf7668db3 /drivers/gpu/drm/nouveau
parent24b102d3488c9d201915d070a519e07098e0cd30 (diff)
downloadlinux-17b20348ea94a92a54898c518b514c564d12e4c3.tar.xz
drm/nv50: mark PCIEGART pages non-present rather than using dummy page
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_sgdma.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
index 5a66a7a..c0b7965 100644
--- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
@@ -151,7 +151,7 @@ nouveau_sgdma_unbind(struct ttm_backend *be)
nv_wo32(gpuobj, (pte * 4) + 0, dma_offset | 3);
pte += 1;
} else {
- nv_wo32(gpuobj, (pte * 4), dma_offset | 0x21);
+ nv_wo32(gpuobj, (pte * 4) + 0, 0x00000000);
nv_wo32(gpuobj, (pte * 4) + 4, 0x00000000);
pte += 2;
}
@@ -279,9 +279,8 @@ nouveau_sgdma_init(struct drm_device *dev)
}
} else {
for (i = 0; i < obj_size; i += 8) {
- nv_wo32(gpuobj, i + 0,
- dev_priv->gart_info.sg_dummy_bus | 0x21);
- nv_wo32(gpuobj, i + 4, 0);
+ nv_wo32(gpuobj, i + 0, 0x00000000);
+ nv_wo32(gpuobj, i + 4, 0x00000000);
}
}
dev_priv->engine.instmem.flush(dev);