Merge tag 'drm-intel-gt-next-2023-12-15' of git://anongit.freedesktop.org/drm/drm...

[linux-2.6-block.git] / drivers / gpu / drm / i915 / gem / i915_gem_execbuffer.c

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 81a57dd52dfda48d31506c7295dbb1ad1868ea57..555022c0652c804d55efbfa94b2d0ca5f9f97225 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -1159,7 +1159,7 @@ static void reloc_cache_unmap(struct reloc_cache *cache)
 
        vaddr = unmask_page(cache->vaddr);
        if (cache->vaddr & KMAP)
-               kunmap_atomic(vaddr);
+               kunmap_local(vaddr);
        else
                io_mapping_unmap_atomic((void __iomem *)vaddr);
 }
@@ -1175,7 +1175,7 @@ static void reloc_cache_remap(struct reloc_cache *cache,
        if (cache->vaddr & KMAP) {
                struct page *page = i915_gem_object_get_page(obj, cache->page);
 
-               vaddr = kmap_atomic(page);
+               vaddr = kmap_local_page(page);
                cache->vaddr = unmask_flags(cache->vaddr) |
                        (unsigned long)vaddr;
        } else {
@@ -1205,7 +1205,7 @@ static void reloc_cache_reset(struct reloc_cache *cache, struct i915_execbuffer
                if (cache->vaddr & CLFLUSH_AFTER)
                        mb();
 
-               kunmap_atomic(vaddr);
+               kunmap_local(vaddr);
                i915_gem_object_finish_access(obj);
        } else {
                struct i915_ggtt *ggtt = cache_to_ggtt(cache);
@@ -1237,7 +1237,7 @@ static void *reloc_kmap(struct drm_i915_gem_object *obj,
        struct page *page;
 
        if (cache->vaddr) {
-               kunmap_atomic(unmask_page(cache->vaddr));
+               kunmap_local(unmask_page(cache->vaddr));
        } else {
                unsigned int flushes;
                int err;
@@ -1259,7 +1259,7 @@ static void *reloc_kmap(struct drm_i915_gem_object *obj,
        if (!obj->mm.dirty)
                set_page_dirty(page);
 
-       vaddr = kmap_atomic(page);
+       vaddr = kmap_local_page(page);
        cache->vaddr = unmask_flags(cache->vaddr) | (unsigned long)vaddr;
        cache->page = pageno;