mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 15:20:41 +00:00
drm/nouveau: check for supported chipset before booting fbdev off the hw
Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Cc: stable@vger.kernel.org
This commit is contained in:
parent
146cfe2476
commit
0e67bed2c7
1 changed files with 10 additions and 1 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue