| Context |
Check |
Description |
| snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/merge (09a0972ac14f67d600aa3c80035367a8074e90eb)
|
| snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/next (3cea11cd5e3b00d91caf0b4730194039b45c5891)
|
| snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch linus/master (b7cbaf59f62f8ab8f157698f9e31642bff525bd0)
|
| snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/fixes (99f070b62322a4b8c1252952735806d09eb44b68)
|
| snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch linux-next (c50585161e791d5ddb924da98741fdf413a0480a)
|
| snowpatch_ozlabs/apply_patch |
fail
|
Failed to apply to any branch
|
@@ -60,19 +60,19 @@ fbmem_fini(struct io_mapping *fb)
static inline u32
fbmem_peek(struct io_mapping *fb, u32 off)
{
- u8 __iomem *p = io_mapping_map_atomic_wc(fb, off & PAGE_MASK);
+ u8 __iomem *p = io_mapping_map_local_wc(fb, off & PAGE_MASK);
u32 val = ioread32(p + (off & ~PAGE_MASK));
- io_mapping_unmap_atomic(p);
+ io_mapping_unmap_local(p);
return val;
}
static inline void
fbmem_poke(struct io_mapping *fb, u32 off, u32 val)
{
- u8 __iomem *p = io_mapping_map_atomic_wc(fb, off & PAGE_MASK);
+ u8 __iomem *p = io_mapping_map_local_wc(fb, off & PAGE_MASK);
iowrite32(val, p + (off & ~PAGE_MASK));
wmb();
- io_mapping_unmap_atomic(p);
+ io_mapping_unmap_local(p);
}
static inline bool
Neither fbmem_peek() nor fbmem_poke() require to disable pagefaults and preemption as a side effect of io_mapping_map_atomic_wc(). Use io_mapping_map_local_wc() instead. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Ben Skeggs <bskeggs@redhat.com> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org --- V3: New patch --- drivers/gpu/drm/nouveau/nvkm/subdev/devinit/fbmem.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)