Skip to content

L
linux
Commit 5c13cac1 authored by Ben Skeggs's avatar Ben Skeggs
Browse files
Options

drm/nouveau: kill unused variable warning if !__OS_HAS_AGP 

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 7caa63c0
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
drivers/gpu/drm/nouveau/nouveau_bo.c
View file @ 5c13cac1
...@@ -1228,7 +1228,6 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) ...@@ -1228,7 +1228,6 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type]; struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
struct nouveau_drm *drm = nouveau_bdev(bdev); struct nouveau_drm *drm = nouveau_bdev(bdev);
struct nouveau_mem *node = mem->mm_node; struct nouveau_mem *node = mem->mm_node;
struct drm_device *dev = drm->dev;
int ret; int ret;
mem->bus.addr = NULL; mem->bus.addr = NULL;
...@@ -1247,7 +1246,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) ...@@ -1247,7 +1246,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
if (drm->agp.stat == ENABLED) { if (drm->agp.stat == ENABLED) {
mem->bus.offset = mem->start << PAGE_SHIFT; mem->bus.offset = mem->start << PAGE_SHIFT;
mem->bus.base = drm->agp.base; mem->bus.base = drm->agp.base;
mem->bus.is_iomem = !dev->agp->cant_use_aperture; mem->bus.is_iomem = !drm->dev->agp->cant_use_aperture;
} }
#endif #endif
if (drm->device.info.family < NV_DEVICE_INFO_V0_TESLA || !node->memtype) if (drm->device.info.family < NV_DEVICE_INFO_V0_TESLA || !node->memtype)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7