diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-01-26 19:42:50 -0500 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-01-27 20:10:34 -0500 |
| commit | 153e019ff398063b8486acadfad9adb806e99474 (patch) | |
| tree | 873812dd5057707068cd87c1c03fdf8749f3fa9a /drivers/gpu | |
| parent | 5d07929808a6430d3d844db4da828dfadbc49cd2 (diff) | |
drm/nv50: fix regression on IGPs
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -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 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, | |||
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | if (phys & 1) { | 47 | if (phys & 1) { |
| 48 | if (dev_priv->vram_sys_base) { | ||
| 49 | phys += dev_priv->vram_sys_base; | ||
| 50 | phys |= 0x30; | ||
| 51 | } | ||
| 52 | |||
| 53 | if (coverage <= 32 * 1024 * 1024) | 48 | if (coverage <= 32 * 1024 * 1024) |
| 54 | phys |= 0x60; | 49 | phys |= 0x60; |
| 55 | else if (coverage <= 64 * 1024 * 1024) | 50 | else if (coverage <= 64 * 1024 * 1024) |