Commit 771fa0e4 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau: fix headless mode

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 0d48b58a
...@@ -477,7 +477,7 @@ nouveau_display_create(struct drm_device *dev) ...@@ -477,7 +477,7 @@ nouveau_display_create(struct drm_device *dev)
drm_kms_helper_poll_init(dev); drm_kms_helper_poll_init(dev);
drm_kms_helper_poll_disable(dev); drm_kms_helper_poll_disable(dev);
if (drm->vbios.dcb.entries) { if (nouveau_modeset != 2 && drm->vbios.dcb.entries) {
static const u16 oclass[] = { static const u16 oclass[] = {
GM107_DISP, GM107_DISP,
GK110_DISP, GK110_DISP,
......
...@@ -306,7 +306,8 @@ static int nouveau_drm_probe(struct pci_dev *pdev, ...@@ -306,7 +306,8 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
#ifdef CONFIG_X86 #ifdef CONFIG_X86
boot = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW; boot = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;
#endif #endif
remove_conflicting_framebuffers(aper, "nouveaufb", boot); if (nouveau_modeset != 2)
remove_conflicting_framebuffers(aper, "nouveaufb", boot);
kfree(aper); kfree(aper);
ret = nouveau_device_create(pdev, NOUVEAU_BUS_PCI, ret = nouveau_device_create(pdev, NOUVEAU_BUS_PCI,
......
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