Skip to contentSkip to conversation

nouveau/instmem: handle iomapping already existing

PATCH Applied Dave Airlie 2 participants 2 messages Aug 25 – Sep 1

Subsystems (4)
lore
Share & tools
lore

Dave Airlie

author maintainer
#0 lore raw

PATCH 1/1 nouveau/instmem: handle iomapping already existing

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")
---
 drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c +3 -0
index f4489efc94a7..22b0fde6ba34 100644
@@ -195,6 +195,9 @@ check_io_mapping(struct nv50_instmem *imem)
 {
 	struct nvkm_device *device = imem->base.subdev.device;
 
+	if (imem->iomap.size)
+		return true;
+
 	return io_mapping_init_wc(&imem->iomap,
 				  device->func->resource_addr(device, NVKM_BAR2_INST),
 				  device->func->resource_size(device, NVKM_BAR2_INST)) != NULL;
Signature · 1 line
2.55.0
maintainer Applied
#1 lore raw
Quoted 1 line · Dave Airlie

[PATCH] nouveau/instmem: handle iomapping already existing

Applied, thanks!

Branch: drm-misc-fixes
Tree: https://gitlab.freedesktop.org/drm/misc/kernel.git

[1/1] nouveau/instmem: handle iomapping already existing
commit: deced5fa01c5

The patch will appear in the next linux-next integration (typically within 24 hours on weekdays).

The patch is queued up for Linus's tree and should land in the next -rc release.