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
This commit is contained in:
commit
b9020c9e59
|
@ -45,11 +45,6 @@ nv50_vm_map_pgt(struct nouveau_gpuobj *pgd, u32 pde,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (phys & 1) {
|
if (phys & 1) {
|
||||||
if (dev_priv->vram_sys_base) {
|
|
||||||
phys += dev_priv->vram_sys_base;
|
|
||||||
phys |= 0x30;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (coverage <= 32 * 1024 * 1024)
|
if (coverage <= 32 * 1024 * 1024)
|
||||||
phys |= 0x60;
|
phys |= 0x60;
|
||||||
else if (coverage <= 64 * 1024 * 1024)
|
else if (coverage <= 64 * 1024 * 1024)
|
||||||
|
|
Reference in New Issue