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

Karol Herbst kherbst at redhat.com
Tue Oct 6 22:05:27 UTC 2020


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>
---
 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 9f4ac2672cf2e..dcb70677d0acc 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;
 		default:
 			nvdev_error(device, "unknown chipset (%08x)\n", boot0);
+			ret = -ENODEV;
 			goto done;
 		}
 
-- 
2.26.2



More information about the dri-devel mailing list