drm/nv50: mark PCIEGART pages non-present rather than using dummy page
authorBen Skeggs <bskeggs@redhat.com>
Sun, 12 Sep 2010 23:57:44 +0000 (09:57 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 24 Sep 2010 06:26:31 +0000 (16:26 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_sgdma.c

index 5a66a7ae6e29e6ebba5bb552091dec380e3e21df..c0b79659419b36179b46d8b7c384ad670b29b5e0 100644 (file)
@@ -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);