diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2014-08-09 22:39:09 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2014-08-14 17:58:38 -0400 |
commit | 5c13cac149b96910291b00bc7953ce984efc4fbc (patch) | |
tree | e14f49f0d0dca8e818e3391ec56908a2bc15086e /drivers/gpu | |
parent | 7caa63c04029c5882865867470c106ef73eafb2b (diff) |
drm/nouveau: kill unused variable warning if !__OS_HAS_AGP
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index da5d631aa5b9..01da508625f2 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c | |||
@@ -1228,7 +1228,6 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) | |||
1228 | struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type]; | 1228 | struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type]; |
1229 | struct nouveau_drm *drm = nouveau_bdev(bdev); | 1229 | struct nouveau_drm *drm = nouveau_bdev(bdev); |
1230 | struct nouveau_mem *node = mem->mm_node; | 1230 | struct nouveau_mem *node = mem->mm_node; |
1231 | struct drm_device *dev = drm->dev; | ||
1232 | int ret; | 1231 | int ret; |
1233 | 1232 | ||
1234 | mem->bus.addr = NULL; | 1233 | mem->bus.addr = NULL; |
@@ -1247,7 +1246,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) | |||
1247 | if (drm->agp.stat == ENABLED) { | 1246 | if (drm->agp.stat == ENABLED) { |
1248 | mem->bus.offset = mem->start << PAGE_SHIFT; | 1247 | mem->bus.offset = mem->start << PAGE_SHIFT; |
1249 | mem->bus.base = drm->agp.base; | 1248 | mem->bus.base = drm->agp.base; |
1250 | mem->bus.is_iomem = !dev->agp->cant_use_aperture; | 1249 | mem->bus.is_iomem = !drm->dev->agp->cant_use_aperture; |
1251 | } | 1250 | } |
1252 | #endif | 1251 | #endif |
1253 | if (drm->device.info.family < NV_DEVICE_INFO_V0_TESLA || !node->memtype) | 1252 | if (drm->device.info.family < NV_DEVICE_INFO_V0_TESLA || !node->memtype) |