Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 130c2561 authored by Daniel Vetter's avatar Daniel Vetter Committed by Keith Packard
Browse files

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



Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent 24dd85ff

drivers/gpu/drm/i915/i915_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/i915_gem_debug.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */