Commit 9430738d authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau: resurrect headless mode since rework

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 5cad16ac
...@@ -360,6 +360,7 @@ nouveau_display_create(struct drm_device *dev) ...@@ -360,6 +360,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 (nouveau_modeset == 1) {
if (nv_device(drm->device)->card_type < NV_50) if (nv_device(drm->device)->card_type < NV_50)
ret = nv04_display_create(dev); ret = nv04_display_create(dev);
else else
...@@ -377,6 +378,8 @@ nouveau_display_create(struct drm_device *dev) ...@@ -377,6 +378,8 @@ nouveau_display_create(struct drm_device *dev)
} }
nouveau_backlight_init(dev); nouveau_backlight_init(dev);
}
return 0; return 0;
vblank_err: vblank_err:
...@@ -395,6 +398,7 @@ nouveau_display_destroy(struct drm_device *dev) ...@@ -395,6 +398,7 @@ nouveau_display_destroy(struct drm_device *dev)
nouveau_backlight_exit(dev); nouveau_backlight_exit(dev);
drm_vblank_cleanup(dev); drm_vblank_cleanup(dev);
if (disp->dtor)
disp->dtor(dev); disp->dtor(dev);
drm_kms_helper_poll_fini(dev); drm_kms_helper_poll_fini(dev);
......
...@@ -63,8 +63,9 @@ MODULE_PARM_DESC(noaccel, "disable kernel/abi16 acceleration"); ...@@ -63,8 +63,9 @@ MODULE_PARM_DESC(noaccel, "disable kernel/abi16 acceleration");
static int nouveau_noaccel = 0; static int nouveau_noaccel = 0;
module_param_named(noaccel, nouveau_noaccel, int, 0400); module_param_named(noaccel, nouveau_noaccel, int, 0400);
MODULE_PARM_DESC(modeset, "enable driver"); MODULE_PARM_DESC(modeset, "enable driver (default: auto, "
static int nouveau_modeset = -1; "0 = disabled, 1 = enabled, 2 = headless)");
int nouveau_modeset = -1;
module_param_named(modeset, nouveau_modeset, int, 0400); module_param_named(modeset, nouveau_modeset, int, 0400);
static struct drm_driver driver; static struct drm_driver driver;
...@@ -363,6 +364,7 @@ nouveau_drm_unload(struct drm_device *dev) ...@@ -363,6 +364,7 @@ nouveau_drm_unload(struct drm_device *dev)
nouveau_pm_fini(dev); nouveau_pm_fini(dev);
if (dev->mode_config.num_crtc)
nouveau_display_fini(dev); nouveau_display_fini(dev);
nouveau_display_destroy(dev); nouveau_display_destroy(dev);
...@@ -403,6 +405,7 @@ nouveau_drm_suspend(struct pci_dev *pdev, pm_message_t pm_state) ...@@ -403,6 +405,7 @@ nouveau_drm_suspend(struct pci_dev *pdev, pm_message_t pm_state)
pm_state.event == PM_EVENT_PRETHAW) pm_state.event == PM_EVENT_PRETHAW)
return 0; return 0;
if (dev->mode_config.num_crtc) {
NV_INFO(drm, "suspending fbcon...\n"); NV_INFO(drm, "suspending fbcon...\n");
nouveau_fbcon_set_suspend(dev, 1); nouveau_fbcon_set_suspend(dev, 1);
...@@ -410,6 +413,7 @@ nouveau_drm_suspend(struct pci_dev *pdev, pm_message_t pm_state) ...@@ -410,6 +413,7 @@ nouveau_drm_suspend(struct pci_dev *pdev, pm_message_t pm_state)
ret = nouveau_display_suspend(dev); ret = nouveau_display_suspend(dev);
if (ret) if (ret)
return ret; return ret;
}
NV_INFO(drm, "evicting buffers...\n"); NV_INFO(drm, "evicting buffers...\n");
ttm_bo_evict_mm(&drm->ttm.bdev, TTM_PL_VRAM); ttm_bo_evict_mm(&drm->ttm.bdev, TTM_PL_VRAM);
...@@ -445,8 +449,10 @@ nouveau_drm_suspend(struct pci_dev *pdev, pm_message_t pm_state) ...@@ -445,8 +449,10 @@ nouveau_drm_suspend(struct pci_dev *pdev, pm_message_t pm_state)
nouveau_client_init(&cli->base); nouveau_client_init(&cli->base);
} }
if (dev->mode_config.num_crtc) {
NV_INFO(drm, "resuming display...\n"); NV_INFO(drm, "resuming display...\n");
nouveau_display_resume(dev); nouveau_display_resume(dev);
}
return ret; return ret;
} }
...@@ -486,8 +492,10 @@ nouveau_drm_resume(struct pci_dev *pdev) ...@@ -486,8 +492,10 @@ nouveau_drm_resume(struct pci_dev *pdev)
nouveau_irq_postinstall(dev); nouveau_irq_postinstall(dev);
nouveau_pm_resume(dev); nouveau_pm_resume(dev);
if (dev->mode_config.num_crtc) {
NV_INFO(drm, "resuming display...\n"); NV_INFO(drm, "resuming display...\n");
nouveau_display_resume(dev); nouveau_display_resume(dev);
}
return 0; return 0;
} }
......
...@@ -141,4 +141,6 @@ int nouveau_drm_resume(struct pci_dev *); ...@@ -141,4 +141,6 @@ int nouveau_drm_resume(struct pci_dev *);
nv_info((cli), fmt, ##args); \ nv_info((cli), fmt, ##args); \
} while (0) } while (0)
extern int nouveau_modeset;
#endif #endif
...@@ -61,6 +61,7 @@ nouveau_irq_handler(DRM_IRQ_ARGS) ...@@ -61,6 +61,7 @@ nouveau_irq_handler(DRM_IRQ_ARGS)
nv_subdev(pmc)->intr(nv_subdev(pmc)); nv_subdev(pmc)->intr(nv_subdev(pmc));
if (dev->mode_config.num_crtc) {
if (device->card_type >= NV_D0) { if (device->card_type >= NV_D0) {
if (nv_rd32(device, 0x000100) & 0x04000000) if (nv_rd32(device, 0x000100) & 0x04000000)
nvd0_display_intr(dev); nvd0_display_intr(dev);
...@@ -69,6 +70,7 @@ nouveau_irq_handler(DRM_IRQ_ARGS) ...@@ -69,6 +70,7 @@ nouveau_irq_handler(DRM_IRQ_ARGS)
if (nv_rd32(device, 0x000100) & 0x04000000) if (nv_rd32(device, 0x000100) & 0x04000000)
nv50_display_intr(dev); nv50_display_intr(dev);
} }
}
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
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