evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Daniel Vetter 2011-09-17 20:55:46 +02:00 • committed by Keith Packard
parent 24dd85ff72
commit 130c2561de
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/i915/i915_gem.c
View file

@ -802,11 +802,11 @@ i915_gem_shmem_pwrite_fast(struct drm_device *dev,
if (IS_ERR(page)) if (IS_ERR(page))
return PTR_ERR(page); return PTR_ERR(page);
vaddr = kmap_atomic(page, KM_USER0); vaddr = kmap_atomic(page);
ret = __copy_from_user_inatomic(vaddr + page_offset, ret = __copy_from_user_inatomic(vaddr + page_offset,
user_data, user_data,
page_length); page_length);
kunmap_atomic(vaddr, KM_USER0); kunmap_atomic(vaddr);
set_page_dirty(page); set_page_dirty(page);
mark_page_accessed(page); mark_page_accessed(page);

6
drivers/gpu/drm/i915/i915_gem_debug.c
View file

@ -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++) { for (page = 0; page < obj->size / PAGE_SIZE; page++) {
int i; int i;
backing_map = kmap_atomic(obj->pages[page], KM_USER0); backing_map = kmap_atomic(obj->pages[page]);
if (backing_map == NULL) { if (backing_map == NULL) {
DRM_ERROR("failed to map backing page\n"); 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; backing_map = NULL;
} }
out: out:
if (backing_map != NULL) if (backing_map != NULL)
kunmap_atomic(backing_map, KM_USER0); kunmap_atomic(backing_map);
iounmap(gtt_mapping); iounmap(gtt_mapping);
/* give syslog time to catch up */ /* give syslog time to catch up */