From 324176e7c8b9f53b1dbf93981a00667121f61902 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 3 Oct 2022 13:20:07 +1000 Subject: [PATCH] drm/nouveau/fifo: program NV_PFIFO_FB_TIMEOUT on init NVGPU and RM both program this value. Fixes a bunch of random hangs running parallel piglit. Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c | 1 + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c index d2b616b97f94..3c2f6ce62286 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c @@ -645,6 +645,7 @@ gf100_fifo_init_pbdmas(struct nvkm_fifo *fifo, u32 mask) nvkm_wr32(device, 0x00221c, ~(1 << 1)); /* PCE1 */ } + nvkm_mask(device, 0x002a04, 0xbfffffff, 0xbfffffff); } static void diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c index 14c604a03f70..07fd5b938184 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c @@ -960,6 +960,7 @@ gk104_fifo_init_pbdmas(struct nvkm_fifo *fifo, u32 mask) struct nvkm_device *device = fifo->engine.subdev.device; nvkm_wr32(device, 0x000204, mask); + nvkm_mask(device, 0x002a04, 0xbfffffff, 0xbfffffff); } void -- 2.25.1