drm/i915: drop KM_USER0 argument to k(un)map_atomic

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 52b199da7d5daadc09c5d54bed76ce9b318160f0..0d0ed77bbe280597f5a462673144f586358e9a6b 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -802,11 +802,11 @@ i915_gem_shmem_pwrite_fast(struct drm_device *dev,
                if (IS_ERR(page))
                        return PTR_ERR(page);
 
-               vaddr = kmap_atomic(page, KM_USER0);
+               vaddr = kmap_atomic(page);
                ret = __copy_from_user_inatomic(vaddr + page_offset,
                                                user_data,
                                                page_length);
-               kunmap_atomic(vaddr, KM_USER0);
+               kunmap_atomic(vaddr);
 
                set_page_dirty(page);
                mark_page_accessed(page);

diff --git a/drivers/gpu/drm/i915/i915_gem_debug.c b/drivers/gpu/drm/i915/i915_gem_debug.c
index ac908757e1762e5ebbe6528243bb5afd27493593..cc93cac242d650a595d447ecf10a95a2765a7d36 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_debug.c
+++ b/drivers/gpu/drm/i915/i915_gem_debug.c
@@ -157,7 +157,7 @@ i915_gem_object_check_coherency(struct drm_i915_gem_object *obj, int handle)
        for (page = 0; page < obj->size / PAGE_SIZE; page++) {
                int i;
 
-               backing_map = kmap_atomic(obj->pages[page], KM_USER0);
+               backing_map = kmap_atomic(obj->pages[page]);
 
                if (backing_map == NULL) {
                        DRM_ERROR("failed to map backing page\n");
@@ -181,13 +181,13 @@ i915_gem_object_check_coherency(struct drm_i915_gem_object *obj, int handle)
                                }
                        }
                }
-               kunmap_atomic(backing_map, KM_USER0);
+               kunmap_atomic(backing_map);
                backing_map = NULL;
        }
 
  out:
        if (backing_map != NULL)
-               kunmap_atomic(backing_map, KM_USER0);
+               kunmap_atomic(backing_map);
        iounmap(gtt_mapping);
 
        /* give syslog time to catch up */