Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9020c9e authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents 1e644d6d 153e019f

drivers/gpu/drm/nouveau/nv50_vm.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -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)