Commit ab93edb2 authored by Dave Airlie's avatar Dave Airlie Committed by Danilo Krummrich
Browse files

nouveau/gsp: allocate enough space for all channel ids. 

This probably isn't the ideal fix, but we ended up using chids
sparsely, and lots of things rely on indexing into the full range,
so just allocate the full range up front.

The GSP code fixes 8 channels into a userd page, but we end up using
a single userd page per channel so end up sparsely using the range.

Fixes a few crashes seen with multiple channels.

Link: https://gitlab.freedesktop.org/drm/nouveau/-/issues/277


Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarDanilo Krummrich <dakr@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231121201109.2988516-1-airlied@gmail.com
parent cea70081

drivers/gpu/drm/nouveau/nvkm/engine/fifo/r535.c

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ r535_fifo_runl_ctor(struct nvkm_fifo *fifo) 
	struct nvkm_runl *runl;

	struct nvkm_engn *engn;

	u32 cgids = 2048;

	u32 chids = 2048 / CHID_PER_USERD;

	u32 chids = 2048;

	int ret;

	NV2080_CTRL_FIFO_GET_DEVICE_INFO_TABLE_PARAMS *ctrl;