drm/nouveau/device: return error for unknown chipsets

karolherbst · airlied · commit c3e0276c31ca · 2020-10-07T15:33:00.000+10:00
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: 24d5ff4 ("drm/nouveau/device: rework mmio mapping code to get rid of second map") Signed-off-by: Karol Herbst <kherbst@redhat.com> Cc: dann frazier <dann.frazier@canonical.com> Cc: dri-devel <dri-devel@lists.freedesktop.org> Cc: Dave Airlie <airlied@redhat.com> Cc: stable@vger.kernel.org Reviewed-by: Jeremy Cline <jcline@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20201006220528.13925-1-kherbst@redhat.com
diff --git 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;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -3149,6 +3149,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,`
`3149`	`3149`	`case 0x168: device->chip = &nv168_chipset; break;`
`3150`	`3150`	`default:`
`3151`	`3151`	`nvdev_error(device, "unknown chipset (%08x)\n", boot0);`
	`3152`	`+ ret = -ENODEV;`
`3152`	`3153`	`goto done;`
`3153`	`3154`	`}`
`3154`	`3155`