diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-06-01 01:56:22 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-12 20:12:58 -0400 |
| commit | cd0b072f95b3dbee5d7b97f52edc40f00d5d28e1 (patch) | |
| tree | 0b61d8f5f84c6d95ed240feff242c694a81e91bf /drivers/gpu/drm/nouveau/nouveau_mem.c | |
| parent | b833ac26f1f1c8e8d9149d83dbdd91432f2807d5 (diff) | |
drm/nouveau: remove left-over !DRIVER_MODESET paths
It's far preferable to have the driver do nothing at all for "nomodeset".
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_mem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_mem.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c index 4274281f45ce..bcf7ed32cd1c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c | |||
| @@ -277,8 +277,7 @@ nouveau_mem_close(struct drm_device *dev) | |||
| 277 | 277 | ||
| 278 | nouveau_ttm_global_release(dev_priv); | 278 | nouveau_ttm_global_release(dev_priv); |
| 279 | 279 | ||
| 280 | if (drm_core_has_AGP(dev) && dev->agp && | 280 | if (drm_core_has_AGP(dev) && dev->agp) { |
| 281 | drm_core_check_feature(dev, DRIVER_MODESET)) { | ||
| 282 | struct drm_agp_mem *entry, *tempe; | 281 | struct drm_agp_mem *entry, *tempe; |
| 283 | 282 | ||
| 284 | /* Remove AGP resources, but leave dev->agp | 283 | /* Remove AGP resources, but leave dev->agp |