diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-09-17 14:55:46 -0400 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2011-10-20 18:26:37 -0400 |
commit | 130c2561dea1c7418e53c1db2282b91a38641abe (patch) | |
tree | f3f1a54ac6ffa6ab961650b8ee3dd5f60727f2f6 /drivers/gpu | |
parent | 24dd85ff723f142093f44244764b9b5c152235b8 (diff) |
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_debug.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 52b199da7d5d..0d0ed77bbe28 100644 --- 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, | |||
802 | if (IS_ERR(page)) | 802 | if (IS_ERR(page)) |
803 | return PTR_ERR(page); | 803 | return PTR_ERR(page); |
804 | 804 | ||
805 | vaddr = kmap_atomic(page, KM_USER0); | 805 | vaddr = kmap_atomic(page); |
806 | ret = __copy_from_user_inatomic(vaddr + page_offset, | 806 | ret = __copy_from_user_inatomic(vaddr + page_offset, |
807 | user_data, | 807 | user_data, |
808 | page_length); | 808 | page_length); |
809 | kunmap_atomic(vaddr, KM_USER0); | 809 | kunmap_atomic(vaddr); |
810 | 810 | ||
811 | set_page_dirty(page); | 811 | set_page_dirty(page); |
812 | mark_page_accessed(page); | 812 | 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 ac908757e176..cc93cac242d6 100644 --- 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) | |||
157 | for (page = 0; page < obj->size / PAGE_SIZE; page++) { | 157 | for (page = 0; page < obj->size / PAGE_SIZE; page++) { |
158 | int i; | 158 | int i; |
159 | 159 | ||
160 | backing_map = kmap_atomic(obj->pages[page], KM_USER0); | 160 | backing_map = kmap_atomic(obj->pages[page]); |
161 | 161 | ||
162 | if (backing_map == NULL) { | 162 | if (backing_map == NULL) { |
163 | DRM_ERROR("failed to map backing page\n"); | 163 | 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) | |||
181 | } | 181 | } |
182 | } | 182 | } |
183 | } | 183 | } |
184 | kunmap_atomic(backing_map, KM_USER0); | 184 | kunmap_atomic(backing_map); |
185 | backing_map = NULL; | 185 | backing_map = NULL; |
186 | } | 186 | } |
187 | 187 | ||
188 | out: | 188 | out: |
189 | if (backing_map != NULL) | 189 | if (backing_map != NULL) |
190 | kunmap_atomic(backing_map, KM_USER0); | 190 | kunmap_atomic(backing_map); |
191 | iounmap(gtt_mapping); | 191 | iounmap(gtt_mapping); |
192 | 192 | ||
193 | /* give syslog time to catch up */ | 193 | /* give syslog time to catch up */ |