[Groovy][PATCH] drm/nouveau/device: return error for unknown chipsets

dann frazier dann.frazier at canonical.com
Thu Oct 8 12:43:51 UTC 2020

From: Karol Herbst <kherbst at redhat.com>

BugLink: https://bugs.launchpad.net/bugs/1898130

Previously the code relied on device->pri to be NULL and to fail probing
later. We really should just return an error inside nvkm_device_ctor for
unsupported GPUs.

Fixes: 24d5ff40a732 ("drm/nouveau/device: rework mmio mapping code to get rid of second map")

Signed-off-by: Karol Herbst <kherbst at redhat.com>
Cc: dann frazier <dann.frazier at canonical.com>
Cc: dri-devel <dri-devel at lists.freedesktop.org>
Cc: Dave Airlie <airlied at redhat.com>
Cc: stable at vger.kernel.org
Reviewed-by: Jeremy Cline <jcline at redhat.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201006220528.13925-1-kherbst@redhat.com
(cherry picked from commit c3e0276c31ca8c7b8615da890727481260d4676f linux-next)
Signed-off-by: dann frazier <dann.frazier at canonical.com>
 drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 5b90c2a1bf3d..7c2e5db840be 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -3149,6 +3149,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
 		case 0x168: device->chip = &nv168_chipset; break;
 			nvdev_error(device, "unknown chipset (%08x)\n", boot0);
+			ret = -ENODEV;
 			goto done;

More information about the kernel-team mailing list