diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 04:10:31 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 05:26:59 +1000 |
| commit | 565bf0ec3ba22fc14671dcf0b7372ef585feba80 (patch) | |
| tree | f50c337cdb7a8cb3eefac106b022609f4e8c90ad | |
| parent | 0b1391a4b802b371c09329187b75c4385492bc60 (diff) | |
drm: fix headless mode
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drm/nouveau_display.c | 2 | ||||
| -rw-r--r-- | drm/nouveau_drm.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drm/nouveau_display.c b/drm/nouveau_display.c index 62f96960..1cc7b603 100644 --- a/drm/nouveau_display.c +++ b/drm/nouveau_display.c @@ -477,7 +477,7 @@ nouveau_display_create(struct drm_device *dev) drm_kms_helper_poll_init(dev); drm_kms_helper_poll_disable(dev); - if (drm->vbios.dcb.entries) { + if (nouveau_modeset != 2 && drm->vbios.dcb.entries) { static const u16 oclass[] = { GM107_DISP, GK110_DISP, diff --git a/drm/nouveau_drm.c b/drm/nouveau_drm.c index 12b5ba3d..14fb8e86 100644 --- a/drm/nouveau_drm.c +++ b/drm/nouveau_drm.c @@ -306,7 +306,8 @@ static int nouveau_drm_probe(struct pci_dev *pdev, #ifdef CONFIG_X86 boot = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW; #endif - remove_conflicting_framebuffers(aper, "nouveaufb", boot); + if (nouveau_modeset != 2) + remove_conflicting_framebuffers(aper, "nouveaufb", boot); kfree(aper); ret = nouveau_device_create(pdev, NOUVEAU_BUS_PCI, |