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

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
...@@ -317,7 +317,16 @@ static int nouveau_drm_probe(struct pci_dev *pdev, ...@@ -317,7 +317,16 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
if (vga_switcheroo_client_probe_defer(pdev)) if (vga_switcheroo_client_probe_defer(pdev))
return -EPROBE_DEFER; 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); aper = alloc_apertures(3);
if (!aper) if (!aper)
return -ENOMEM; return -ENOMEM;
......
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