drm/nouveau/device: return error for unknown chipsets
Subsystems (4)
PATCH 1/2 drm/nouveau/device: return error for unknown chipsets
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 <[email protected]>
Cc dann frazier <[email protected]>
Cc dri-devel <[email protected]>
Cc Dave Airlie <[email protected]>
Reviewed-by Jeremy Cline <[email protected]>
--- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +1 -0
@@ -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; }
Signature · 1 line
2.26.2
PATCH 2/2 drm/nouveau/mem: guard against NULL pointer access in mem_del
other drivers seems to do something similar
Signed-off-by Karol Herbst <[email protected]>
Cc dri-devel <[email protected]>
Cc Dave Airlie <[email protected]>
--- drivers/gpu/drm/nouveau/nouveau_mem.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/nouveau/nouveau_mem.c +2 -0
@@ -176,6 +176,8 @@ void nouveau_mem_del(struct ttm_mem_reg *reg) {struct nouveau_mem *mem =nouveau_mem (reg); +if (!mem) +return ;nouveau_mem_fini (mem);kfree (reg->mm_node); reg->mm_node =NULL ;
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel