diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-07-12 11:57:07 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-07-14 11:55:10 +1000 |
| commit | 0e67bed2c765ff0fdaec62c963881f5416fe3692 (patch) | |
| tree | b67b5c15770dfcee442f0acd1f1c89de21e6bb79 | |
| parent | 146cfe2476ce378580e81143182e60d6ecc380ca (diff) | |
| download | op-kernel-dev-0e67bed2c765ff0fdaec62c963881f5416fe3692.zip op-kernel-dev-0e67bed2c765ff0fdaec62c963881f5416fe3692.tar.gz | |
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
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 05915c1..6dd396f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -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; |
