[PATCH] nouveau/instmem: handle iomapping already existing

Dave Airlie <[email protected]> Wed, 29 Jul 2026 12:45:16 +1000
Newsgroups org.freedesktop.lists.nouveau,org.freedesktop.lists.dri-devel
Message-ID <[email protected]>
From: Dave Airlie <[email protected]>

Turns out sashiko was right, and I should protect this properly

Fixes: 34e27b90552a ("nouveau/instmem: use iomapping interface for instmem =
handling")
Signed-off-by: Dave Airlie <[email protected]>
---
 drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c b/drivers/g=
pu/drm/nouveau/nvkm/subdev/instmem/nv50.c
index f4489efc94a7..22b0fde6ba34 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c
@@ -195,6 +195,9 @@ check_io_mapping(struct nv50_instmem *imem)
 {
 =09struct nvkm_device *device =3D imem->base.subdev.device;
=20
+=09if (imem->iomap.size)
+=09=09return true;
+
 =09return io_mapping_init_wc(&imem->iomap,
 =09=09=09=09  device->func->resource_addr(device, NVKM_BAR2_INST),
 =09=09=09=09  device->func->resource_size(device, NVKM_BAR2_INST)) !=3D NU=
LL;
--=20
2.55.0