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

Commit 0e67bed2 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: check for supported chipset before booting fbdev off the hw



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Cc: stable@vger.kernel.org
parent 146cfe24
Loading
Loading
Loading
Loading
+10 −1
Original line number Diff line number Diff line
@@ -317,7 +317,16 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
	if (vga_switcheroo_client_probe_defer(pdev))
		return -EPROBE_DEFER;

	/* remove conflicting drivers (vesafb, efifb etc) */
	/* We need to check that the chipset is supported before booting
	 * fbdev off the hardware, as there's no way to put it back.
	 */
	ret = nvkm_device_pci_new(pdev, NULL, "error", true, false, 0, &device);
	if (ret)
		return ret;

	nvkm_device_del(&device);

	/* Remove conflicting drivers (vesafb, efifb etc). */
	aper = alloc_apertures(3);
	if (!aper)
		return -ENOMEM;