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 05915c10d07e..6dd396f56884 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;