drm/nouveau: fix init with agpgart-uninorth

aakoskin · airlied · commit eda85d6ad490 · 2013-01-04T16:04:33.000+10:00
Check that the AGP aperture can be mapped. This follows a similar change done for Radeon (commit 365048f, drm/radeon: AGP memory is only I/O if the aperture can be mapped by the CPU.). The patch fixes the following error seen on G5 iMac: nouveau E[ DRM] failed to create kernel channel, -12 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58806 Cc: stable@vger.kernel.org Reviewed-by: Michel Dänzer <michel@daenzer.net> Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -1276,7 +1276,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
 		if (drm->agp.stat == ENABLED) {
 			mem->bus.offset = mem->start << PAGE_SHIFT;
 			mem->bus.base = drm->agp.base;
-			mem->bus.is_iomem = true;
+			mem->bus.is_iomem = !dev->agp->cant_use_aperture;
 		}
 #endif
 		break;

Original file line number	Diff line number	Diff line change
`@@ -1276,7 +1276,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device bdev, struct ttm_mem_reg mem)`
`1276`	`1276`	`if (drm->agp.stat == ENABLED) {`
`1277`	`1277`	`mem->bus.offset = mem->start << PAGE_SHIFT;`
`1278`	`1278`	`mem->bus.base = drm->agp.base;`
`1279`		`- mem->bus.is_iomem = true;`
	`1279`	`+ mem->bus.is_iomem = !dev->agp->cant_use_aperture;`
`1280`	`1280`	`}`
`1281`	`1281`	`#endif`
`1282`	`1282`	`break;`