summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-01-27 10:42:50 +1000
committerBen Skeggs <bskeggs@redhat.com>2011-01-28 11:10:34 +1000
commit153e019ff398063b8486acadfad9adb806e99474 (patch)
tree873812dd5057707068cd87c1c03fdf8749f3fa9a
parent5d07929808a6430d3d844db4da828dfadbc49cd2 (diff)
downloadlinux-stable-153e019ff398063b8486acadfad9adb806e99474.tar.gz
linux-stable-153e019ff398063b8486acadfad9adb806e99474.tar.bz2
linux-stable-153e019ff398063b8486acadfad9adb806e99474.zip
drm/nv50: fix regression on IGPs
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nv50_vm.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_vm.c b/drivers/gpu/drm/nouveau/nv50_vm.c
index 38e523e10995..459ff08241e5 100644
--- a/drivers/gpu/drm/nouveau/nv50_vm.c
+++ b/drivers/gpu/drm/nouveau/nv50_vm.c
@@ -45,11 +45,6 @@ nv50_vm_map_pgt(struct nouveau_gpuobj *pgd, u32 pde,
}
if (phys & 1) {
- if (dev_priv->vram_sys_base) {
- phys += dev_priv->vram_sys_base;
- phys |= 0x30;
- }
-
if (coverage <= 32 * 1024 * 1024)
phys |= 0x60;
else if (coverage <= 64 * 1024 * 1024)