Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e412e95a authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: headless mode by default if pci class != vga display 



This is to prevent nouveau from taking over the console on headless boards
such as Tesla.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 9430738d

drivers/gpu/drm/nouveau/nouveau_display.c

+3 −1
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ nouveau_display_create(struct drm_device *dev) 
	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nouveau_disp *pdisp = nouveau_disp(drm->device);

	struct nouveau_display *disp;

	u32 pclass = dev->pdev->class >> 8;

	int ret, gen;



	disp = drm->display = kzalloc(sizeof(*disp), GFP_KERNEL);
@@ -360,7 +361,8 @@ nouveau_display_create(struct drm_device *dev) 
	drm_kms_helper_poll_init(dev);

	drm_kms_helper_poll_disable(dev);



	if (nouveau_modeset == 1) {

	if (nouveau_modeset == 1 ||

	    (nouveau_modeset < 0 && pclass == PCI_CLASS_DISPLAY_VGA)) {

		if (nv_device(drm->device)->card_type < NV_50)

			ret = nv04_display_create(dev);

		else

drivers/gpu/drm/nouveau/nouveau_drm.c

+0 −2
Original line number Diff line number Diff line
@@ -670,9 +670,7 @@ nouveau_drm_init(void) 
#ifdef CONFIG_VGA_CONSOLE

		if (vgacon_text_force())

			nouveau_modeset = 0;

		else

#endif

			nouveau_modeset = 1;

	}



	if (!nouveau_modeset)