kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/gpu/drm/qxl/qxl_object.c
..
..
@@ -173,8 +173,8 @@
173
173
 	return 0;
174
174
 }
175
175
 
176
-void *qxl_bo_kmap_local_page(struct qxl_device *qdev,
177
-			     struct qxl_bo *bo, int page_offset)
176
+void *qxl_bo_kmap_atomic_page(struct qxl_device *qdev,
177
+			      struct qxl_bo *bo, int page_offset)
178
178
 {
179
179
 	unsigned long offset;
180
180
 	void *rptr;
..
..
@@ -189,7 +189,7 @@
189
189
 		goto fallback;
190
190
 
191
191
 	offset = bo->tbo.mem.start << PAGE_SHIFT;
192
-	return io_mapping_map_local_wc(map, offset + page_offset);
192
+	return io_mapping_map_atomic_wc(map, offset + page_offset);
193
193
 fallback:
194
194
 	if (bo->kptr) {
195
195
 		rptr = bo->kptr + (page_offset * PAGE_SIZE);
..
..
@@ -215,14 +215,14 @@
215
215
 	ttm_bo_kunmap(&bo->kmap);
216
216
 }
217
217
 
218
-void qxl_bo_kunmap_local_page(struct qxl_device *qdev,
219
-			      struct qxl_bo *bo, void *pmap)
218
+void qxl_bo_kunmap_atomic_page(struct qxl_device *qdev,
219
+			       struct qxl_bo *bo, void *pmap)
220
220
 {
221
221
 	if ((bo->tbo.mem.mem_type != TTM_PL_VRAM) &&
222
222
 	    (bo->tbo.mem.mem_type != TTM_PL_PRIV))
223
223
 		goto fallback;
224
224
 
225
-	io_mapping_unmap_local(pmap);
225
+	io_mapping_unmap_atomic(pmap);
226
226
 	return;
227
227
  fallback:
228
228
 	qxl_bo_kunmap(bo);