diff options
| author | Dave Airlie <airlied@redhat.com> | 2026-08-25 13:06:15 +1000 |
|---|---|---|
| committer | Danilo Krummrich <dakr@kernel.org> | 2026-09-01 11:01:25 +0200 |
| commit | deced5fa01c5e9813384b6c176379e5baaf5ec10 (patch) | |
| tree | 80ec971e280b815b3d2ce24b0a65bb21035db5dd | |
| parent | 38a62306c4266bcb3cd89e33c7111ee33096ebb3 (diff) | |
| download | linux-deced5fa01c5e9813384b6c176379e5baaf5ec10.tar.gz linux-deced5fa01c5e9813384b6c176379e5baaf5ec10.zip | |
nouveau/instmem: handle iomapping already existing
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 <airlied@redhat.com>
Link: https://patch.msgid.link/20260825030615.3464436-1-airlied@gmail.com
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c b/drivers/gpu/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) { 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; |