drm,io-mapping: Specify slot to use for atomic mappings
This is required should we ever attempt to use an io-mapping where
KM_USER0 is verboten, such as inside an IRQ context.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index b59f348..7369b5e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -2083,11 +2083,11 @@
uint32_t val = 0;
if (off < pci_resource_len(dev->pdev, 1)) {
- uint32_t __iomem *p = io_mapping_map_atomic_wc(fb, off);
+ uint32_t __iomem *p = io_mapping_map_atomic_wc(fb, off, KM_USER0);
val = ioread32(p);
- io_mapping_unmap_atomic(p);
+ io_mapping_unmap_atomic(p, KM_USER0);
}
return val;
@@ -2098,12 +2098,12 @@
uint32_t off, uint32_t val)
{
if (off < pci_resource_len(dev->pdev, 1)) {
- uint32_t __iomem *p = io_mapping_map_atomic_wc(fb, off);
+ uint32_t __iomem *p = io_mapping_map_atomic_wc(fb, off, KM_USER0);
iowrite32(val, p);
wmb();
- io_mapping_unmap_atomic(p);
+ io_mapping_unmap_atomic(p, KM_USER0);
}
}