diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-06-01 15:56:22 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-13 10:12:58 +1000 |
| commit | cd0b072f95b3dbee5d7b97f52edc40f00d5d28e1 (patch) | |
| tree | 0b61d8f5f84c6d95ed240feff242c694a81e91bf /drivers/gpu/drm/nouveau/nouveau_dma.c | |
| parent | b833ac26f1f1c8e8d9149d83dbdd91432f2807d5 (diff) | |
| download | kernel_samsung_smdk4412-cd0b072f95b3dbee5d7b97f52edc40f00d5d28e1.zip kernel_samsung_smdk4412-cd0b072f95b3dbee5d7b97f52edc40f00d5d28e1.tar.gz kernel_samsung_smdk4412-cd0b072f95b3dbee5d7b97f52edc40f00d5d28e1.tar.bz2 | |
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_dma.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_dma.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c index 65c441a..2e3c6ca 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dma.c +++ b/drivers/gpu/drm/nouveau/nouveau_dma.c @@ -92,11 +92,9 @@ nouveau_dma_init(struct nouveau_channel *chan) return ret; /* Map M2MF notifier object - fbcon. */ - if (drm_core_check_feature(dev, DRIVER_MODESET)) { - ret = nouveau_bo_map(chan->notifier_bo); - if (ret) - return ret; - } + ret = nouveau_bo_map(chan->notifier_bo); + if (ret) + return ret; /* Insert NOPS for NOUVEAU_DMA_SKIPS */ ret = RING_SPACE(chan, NOUVEAU_DMA_SKIPS); |