From 6778948f9de86c3cfaf36725a7c87dcff9ba247f Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Mon, 11 Dec 2023 08:20:59 +0000 Subject: [PATCH] kernel_5.10 no rt --- kernel/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/kernel/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/kernel/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 2abf043..0c083af 100644 --- a/kernel/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/kernel/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -1080,7 +1080,7 @@ struct i915_ggtt *ggtt = cache_to_ggtt(cache); intel_gt_flush_ggtt_writes(ggtt->vm.gt); - io_mapping_unmap_local((void __iomem *)vaddr); + io_mapping_unmap_atomic((void __iomem *)vaddr); if (drm_mm_node_allocated(&cache->node)) { ggtt->vm.clear_range(&ggtt->vm, @@ -1146,7 +1146,7 @@ if (cache->vaddr) { intel_gt_flush_ggtt_writes(ggtt->vm.gt); - io_mapping_unmap_local((void __force __iomem *) unmask_page(cache->vaddr)); + io_mapping_unmap_atomic((void __force __iomem *) unmask_page(cache->vaddr)); } else { struct i915_vma *vma; int err; @@ -1194,7 +1194,8 @@ offset += page << PAGE_SHIFT; } - vaddr = (void __force *)io_mapping_map_local_wc(&ggtt->iomap, offset); + vaddr = (void __force *)io_mapping_map_atomic_wc(&ggtt->iomap, + offset); cache->page = page; cache->vaddr = (unsigned long)vaddr; -- Gitblit v1.6.2