5 files changed, 24 insertions, 27 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 90b1d6753b9d..eb6c473c6d1b 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -155,11 +155,11 @@ fast_shmem_read(struct page **pages,
         char __iomem *vaddr;
         int unwritten;
 
-        vaddr = kmap_atomic(pages[page_base >> PAGE_SHIFT], KM_USER0);
+        vaddr = kmap_atomic(pages[page_base >> PAGE_SHIFT]);
         if (vaddr == NULL)
                 return -ENOMEM;
         unwritten = __copy_to_user_inatomic(data, vaddr + page_offset, length);
-        kunmap_atomic(vaddr, KM_USER0);
+        kunmap_atomic(vaddr);
 
         if (unwritten)
                 return -EFAULT;
@@ -509,10 +509,10 @@ fast_user_write(struct io_mapping *mapping,
         char *vaddr_atomic;
         unsigned long unwritten;
 
-        vaddr_atomic = io_mapping_map_atomic_wc(mapping, page_base, KM_USER0);
+        vaddr_atomic = io_mapping_map_atomic_wc(mapping, page_base);
         unwritten = __copy_from_user_inatomic_nocache(vaddr_atomic + page_offset,
                                                       user_data, length);
-        io_mapping_unmap_atomic(vaddr_atomic, KM_USER0);
+        io_mapping_unmap_atomic(vaddr_atomic);
         if (unwritten)
                 return -EFAULT;
         return 0;
@@ -551,11 +551,11 @@ fast_shmem_write(struct page **pages,
         char __iomem *vaddr;
         unsigned long unwritten;
 
-        vaddr = kmap_atomic(pages[page_base >> PAGE_SHIFT], KM_USER0);
+        vaddr = kmap_atomic(pages[page_base >> PAGE_SHIFT]);
         if (vaddr == NULL)
                 return -ENOMEM;
         unwritten = __copy_from_user_inatomic(vaddr + page_offset, data, length);
-        kunmap_atomic(vaddr, KM_USER0);
+        kunmap_atomic(vaddr);
 
         if (unwritten)
                 return -EFAULT;
@@ -3346,8 +3346,7 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
                 reloc_offset = obj_priv->gtt_offset + reloc->offset;
                 reloc_page = io_mapping_map_atomic_wc(dev_priv->mm.gtt_mapping,
                                                       (reloc_offset &
-                                                       ~(PAGE_SIZE - 1)),
-                                                      KM_USER0);
+                                                       ~(PAGE_SIZE - 1)));
                 reloc_entry = (uint32_t __iomem *)(reloc_page +
                                                    (reloc_offset & (PAGE_SIZE - 1)));
                 reloc_val = target_obj_priv->gtt_offset + reloc->delta;
@@ -3358,7 +3357,7 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
                           readl(reloc_entry), reloc_val);
 #endif
                 writel(reloc_val, reloc_entry);
-                io_mapping_unmap_atomic(reloc_page, KM_USER0);
+                io_mapping_unmap_atomic(reloc_page);
 
                 /* The updated presumed offset for this entry will be
                  * copied back out to the user.
@@ -4772,11 +4771,11 @@ void i915_gem_detach_phys_object(struct drm_device *dev,
         page_count = obj->size / PAGE_SIZE;
 
         for (i = 0; i < page_count; i++) {
-                char *dst = kmap_atomic(obj_priv->pages[i], KM_USER0);
+                char *dst = kmap_atomic(obj_priv->pages[i]);
                 char *src = obj_priv->phys_obj->handle->vaddr + (i * PAGE_SIZE);
 
                 memcpy(dst, src, PAGE_SIZE);
-                kunmap_atomic(dst, KM_USER0);
+                kunmap_atomic(dst);
         }
         drm_clflush_pages(obj_priv->pages, page_count);
         drm_agp_chipset_flush(dev);
@@ -4833,11 +4832,11 @@ i915_gem_attach_phys_object(struct drm_device *dev,
         page_count = obj->size / PAGE_SIZE;
 
         for (i = 0; i < page_count; i++) {
-                char *src = kmap_atomic(obj_priv->pages[i], KM_USER0);
+                char *src = kmap_atomic(obj_priv->pages[i]);
                 char *dst = obj_priv->phys_obj->handle->vaddr + (i * PAGE_SIZE);
 
                 memcpy(dst, src, PAGE_SIZE);
-                kunmap_atomic(src, KM_USER0);
+                kunmap_atomic(src);
         }
 
         i915_gem_object_put_pages(obj);
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 744225ebb4b2..b80010f0c4c9 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -456,10 +456,9 @@ i915_error_object_create(struct drm_device *dev,
 
                 local_irq_save(flags);
                 s = io_mapping_map_atomic_wc(dev_priv->mm.gtt_mapping,
-                                             reloc_offset,
-                                             KM_IRQ0);
+                                             reloc_offset);
                 memcpy_fromio(d, s, PAGE_SIZE);
-                io_mapping_unmap_atomic(s, KM_IRQ0);
+                io_mapping_unmap_atomic(s);
                 local_irq_restore(flags);
 
                 dst->pages[page] = d;
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index 1d306a458be6..3264bbd47e65 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -187,8 +187,7 @@ static struct overlay_registers *intel_overlay_map_regs_atomic(struct intel_over
 
         if (OVERLAY_NONPHYSICAL(overlay->dev)) {
                 regs = io_mapping_map_atomic_wc(dev_priv->mm.gtt_mapping,
-                                                overlay->reg_bo->gtt_offset,
-                                                KM_USER0);
+                                                overlay->reg_bo->gtt_offset);
 
                 if (!regs) {
                         DRM_ERROR("failed to map overlay regs in GTT\n");
@@ -203,7 +202,7 @@ static struct overlay_registers *intel_overlay_map_regs_atomic(struct intel_over
 static void intel_overlay_unmap_regs_atomic(struct intel_overlay *overlay)
 {
         if (OVERLAY_NONPHYSICAL(overlay->dev))
-                io_mapping_unmap_atomic(overlay->virt_addr, KM_USER0);
+                io_mapping_unmap_atomic(overlay->virt_addr);
 
         overlay->virt_addr = NULL;
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 974b0f8ae048..8fa339600fe3 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -2167,11 +2167,11 @@ peek_fb(struct drm_device *dev, struct io_mapping *fb,
 
         if (off < pci_resource_len(dev->pdev, 1)) {
                 uint8_t __iomem *p =
-                        io_mapping_map_atomic_wc(fb, off & PAGE_MASK, KM_USER0);
+                        io_mapping_map_atomic_wc(fb, off & PAGE_MASK);
 
                 val = ioread32(p + (off & ~PAGE_MASK));
 
-                io_mapping_unmap_atomic(p, KM_USER0);
+                io_mapping_unmap_atomic(p);
         }
 
         return val;
@@ -2183,12 +2183,12 @@ poke_fb(struct drm_device *dev, struct io_mapping *fb,
 {
         if (off < pci_resource_len(dev->pdev, 1)) {
                 uint8_t __iomem *p =
-                        io_mapping_map_atomic_wc(fb, off & PAGE_MASK, KM_USER0);
+                        io_mapping_map_atomic_wc(fb, off & PAGE_MASK);
 
                 iowrite32(val, p + (off & ~PAGE_MASK));
                 wmb();
 
-                io_mapping_unmap_atomic(p, KM_USER0);
+                io_mapping_unmap_atomic(p);
         }
 }
 
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 3451a82adba7..e8a73e65da69 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -170,7 +170,7 @@ static int ttm_copy_io_ttm_page(struct ttm_tt *ttm, void *src,
         src = (void *)((unsigned long)src + (page << PAGE_SHIFT));
 
 #ifdef CONFIG_X86
-        dst = kmap_atomic_prot(d, KM_USER0, prot);
+        dst = kmap_atomic_prot(d, prot);
 #else
         if (pgprot_val(prot) != pgprot_val(PAGE_KERNEL))
                 dst = vmap(&d, 1, 0, prot);
@@ -183,7 +183,7 @@ static int ttm_copy_io_ttm_page(struct ttm_tt *ttm, void *src,
         memcpy_fromio(dst, src, PAGE_SIZE);
 
 #ifdef CONFIG_X86
-        kunmap_atomic(dst, KM_USER0);
+        kunmap_atomic(dst);
 #else
         if (pgprot_val(prot) != pgprot_val(PAGE_KERNEL))
                 vunmap(dst);
@@ -206,7 +206,7 @@ static int ttm_copy_ttm_io_page(struct ttm_tt *ttm, void *dst,
 
         dst = (void *)((unsigned long)dst + (page << PAGE_SHIFT));
 #ifdef CONFIG_X86
-        src = kmap_atomic_prot(s, KM_USER0, prot);
+        src = kmap_atomic_prot(s, prot);
 #else
         if (pgprot_val(prot) != pgprot_val(PAGE_KERNEL))
                 src = vmap(&s, 1, 0, prot);
@@ -219,7 +219,7 @@ static int ttm_copy_ttm_io_page(struct ttm_tt *ttm, void *dst,
         memcpy_toio(dst, src, PAGE_SIZE);
 
 #ifdef CONFIG_X86
-        kunmap_atomic(src, KM_USER0);
+        kunmap_atomic(src);
 #else
         if (pgprot_val(prot) != pgprot_val(PAGE_KERNEL))
                 vunmap(src);