export RK_PA3

hc

2024-02-19 151fecfb72a0d602dfe79790602ef64b4e241574

 kernel/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/fbmem.h
..
..
@@ -60,19 +60,19 @@
60
60
 static inline u32
61
61
 fbmem_peek(struct io_mapping *fb, u32 off)
62
62
 {
63
-	u8 __iomem *p = io_mapping_map_local_wc(fb, off & PAGE_MASK);
63
+	u8 __iomem *p = io_mapping_map_atomic_wc(fb, off & PAGE_MASK);
64
64
 	u32 val = ioread32(p + (off & ~PAGE_MASK));
65
-	io_mapping_unmap_local(p);
65
+	io_mapping_unmap_atomic(p);
66
66
 	return val;
67
67
 }
68
68
 
69
69
 static inline void
70
70
 fbmem_poke(struct io_mapping *fb, u32 off, u32 val)
71
71
 {
72
-	u8 __iomem *p = io_mapping_map_local_wc(fb, off & PAGE_MASK);
72
+	u8 __iomem *p = io_mapping_map_atomic_wc(fb, off & PAGE_MASK);
73
73
 	iowrite32(val, p + (off & ~PAGE_MASK));
74
74
 	wmb();
75
-	io_mapping_unmap_local(p);
75
+	io_mapping_unmap_atomic(p);
76
76
 }
77
77
 
78
78
 static inline bool