diff options
| author | Dave Airlie <airlied@gmail.com> | 2011-01-28 11:12:53 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2011-01-28 11:12:53 +1000 |
| commit | b9020c9e5953f6938e1968ba0034b46292ac5d51 (patch) | |
| tree | a5155fc1a616da4832711e41bb761e4a7cec8d45 | |
| parent | 1e644d6dce366a7bae22484f60133b61ba322911 (diff) | |
| parent | 153e019ff398063b8486acadfad9adb806e99474 (diff) | |
| download | kernel_samsung_tuna-b9020c9e5953f6938e1968ba0034b46292ac5d51.zip kernel_samsung_tuna-b9020c9e5953f6938e1968ba0034b46292ac5d51.tar.gz kernel_samsung_tuna-b9020c9e5953f6938e1968ba0034b46292ac5d51.tar.bz2 | |
Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
* 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6:
drm/nv50: fix regression on IGPs
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_vm.c | 5 |
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 38e523e..459ff08 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) |