---

yaml --- r: 334408 b: refs/heads/master c: df1b4b9 h: refs/heads/master v: v3
git-mirror · Oct 16, 2012 · b54bab7 · b54bab7
1 parent 79983a5
commit b54bab7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5db4c6c5dd26f7737c1fa45ea73549b8aef6e395
+refs/heads/master: df1b4b91e5dae04782f65f657d771b23ca3bdc99
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -456,13 +456,15 @@ static struct ttm_tt *
 nouveau_ttm_tt_create(struct ttm_bo_device *bdev, unsigned long size,
 		      uint32_t page_flags, struct page *dummy_read)
 {
+#if __OS_HAS_AGP
 	struct nouveau_drm *drm = nouveau_bdev(bdev);
 	struct drm_device *dev = drm->dev;
 
 	if (drm->agp.stat == ENABLED) {
 		return ttm_agp_tt_create(bdev, dev->agp->bridge, size,
 					 page_flags, dummy_read);
 	}
+#endif
 
 	return nouveau_sgdma_create_ttm(bdev, size, page_flags, dummy_read);
 }