浏览代码

drm/nouveau: only call ttm_agp_tt_create when __OS_HAS_AGP

ttm_agp_tt_create is itself defined under CONFIG_AGP, so there's no
point calling it otherwise.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Max Filippov 13 年之前
父节点
当前提交
df1b4b91e5
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      drivers/gpu/drm/nouveau/nouveau_bo.c

+ 2 - 0
drivers/gpu/drm/nouveau/nouveau_bo.c

@@ -456,6 +456,7 @@ static struct ttm_tt *
 nouveau_ttm_tt_create(struct ttm_bo_device *bdev, unsigned long size,
 nouveau_ttm_tt_create(struct ttm_bo_device *bdev, unsigned long size,
 		      uint32_t page_flags, struct page *dummy_read)
 		      uint32_t page_flags, struct page *dummy_read)
 {
 {
+#if __OS_HAS_AGP
 	struct nouveau_drm *drm = nouveau_bdev(bdev);
 	struct nouveau_drm *drm = nouveau_bdev(bdev);
 	struct drm_device *dev = drm->dev;
 	struct drm_device *dev = drm->dev;
 
 
@@ -463,6 +464,7 @@ nouveau_ttm_tt_create(struct ttm_bo_device *bdev, unsigned long size,
 		return ttm_agp_tt_create(bdev, dev->agp->bridge, size,
 		return ttm_agp_tt_create(bdev, dev->agp->bridge, size,
 					 page_flags, dummy_read);
 					 page_flags, dummy_read);
 	}
 	}
+#endif
 
 
 	return nouveau_sgdma_create_ttm(bdev, size, page_flags, dummy_read);
 	return nouveau_sgdma_create_ttm(bdev, size, page_flags, dummy_read);
 }
 }