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

Commit 1c9c20f6 authored by Cong Wang's avatar Cong Wang Committed by Cong Wang
Browse files

drm: remove the second argument of k[un]map_atomic() 



Signed-off-by: default avatarCong Wang <amwang@redhat.com>
parent 4e5df7ca

drivers/gpu/drm/drm_cache.c

+4 −4
Original line number Diff line number Diff line
@@ -41,10 +41,10 @@ drm_clflush_page(struct page *page) 
	if (unlikely(page == NULL))

		return;



	page_virtual = kmap_atomic(page, KM_USER0);

	page_virtual = kmap_atomic(page);

	for (i = 0; i < PAGE_SIZE; i += boot_cpu_data.x86_clflush_size)

		clflush(page_virtual + i);

	kunmap_atomic(page_virtual, KM_USER0);

	kunmap_atomic(page_virtual);

}



static void drm_cache_flush_clflush(struct page *pages[],
@@ -87,10 +87,10 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages) 
		if (unlikely(page == NULL))

			continue;



		page_virtual = kmap_atomic(page, KM_USER0);

		page_virtual = kmap_atomic(page);

		flush_dcache_range((unsigned long)page_virtual,

				   (unsigned long)page_virtual + PAGE_SIZE);

		kunmap_atomic(page_virtual, KM_USER0);

		kunmap_atomic(page_virtual);

	}

#else

	printk(KERN_ERR "Architecture has no drm_cache.c support\n");

drivers/gpu/drm/ttm/ttm_tt.c

+8 −8
Original line number Diff line number Diff line
@@ -309,11 +309,11 @@ int ttm_tt_swapin(struct ttm_tt *ttm) 
			goto out_err;



		preempt_disable();

		from_virtual = kmap_atomic(from_page, KM_USER0);

		to_virtual = kmap_atomic(to_page, KM_USER1);

		from_virtual = kmap_atomic(from_page);

		to_virtual = kmap_atomic(to_page);

		memcpy(to_virtual, from_virtual, PAGE_SIZE);

		kunmap_atomic(to_virtual, KM_USER1);

		kunmap_atomic(from_virtual, KM_USER0);

		kunmap_atomic(to_virtual);

		kunmap_atomic(from_virtual);

		preempt_enable();

		page_cache_release(from_page);

	}
@@ -365,11 +365,11 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage) 
			goto out_err;

		}

		preempt_disable();

		from_virtual = kmap_atomic(from_page, KM_USER0);

		to_virtual = kmap_atomic(to_page, KM_USER1);

		from_virtual = kmap_atomic(from_page);

		to_virtual = kmap_atomic(to_page);

		memcpy(to_virtual, from_virtual, PAGE_SIZE);

		kunmap_atomic(to_virtual, KM_USER1);

		kunmap_atomic(from_virtual, KM_USER0);

		kunmap_atomic(to_virtual);

		kunmap_atomic(from_virtual);

		preempt_enable();

		set_page_dirty(to_page);

		mark_page_accessed(to_page);

drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c

+3 −3
Original line number Diff line number Diff line
@@ -136,10 +136,10 @@ static int vmw_gmr_build_descriptors(struct list_head *desc_pages, 


		if (likely(page_virtual != NULL)) {

			desc_virtual->ppn = page_to_pfn(page);

			kunmap_atomic(page_virtual, KM_USER0);

			kunmap_atomic(page_virtual);

		}



		page_virtual = kmap_atomic(page, KM_USER0);

		page_virtual = kmap_atomic(page);

		desc_virtual = page_virtual - 1;

		prev_pfn = ~(0UL);
@@ -169,7 +169,7 @@ static int vmw_gmr_build_descriptors(struct list_head *desc_pages, 
	}



	if (likely(page_virtual != NULL))

		kunmap_atomic(page_virtual, KM_USER0);

		kunmap_atomic(page_virtual);



	return 0;

out_err: