aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/drm_cache.c8
-rw-r--r--drivers/gpu/drm/ttm/ttm_tt.c16
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c6
3 files changed, 15 insertions, 15 deletions
diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c
index 592865381c6e..4b8653b932f9 100644
--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c
@@ -41,10 +41,10 @@ drm_clflush_page(struct page *page)
41 if (unlikely(page == NULL)) 41 if (unlikely(page == NULL))
42 return; 42 return;
43 43
44 page_virtual = kmap_atomic(page, KM_USER0); 44 page_virtual = kmap_atomic(page);
45 for (i = 0; i < PAGE_SIZE; i += boot_cpu_data.x86_clflush_size) 45 for (i = 0; i < PAGE_SIZE; i += boot_cpu_data.x86_clflush_size)
46 clflush(page_virtual + i); 46 clflush(page_virtual + i);
47 kunmap_atomic(page_virtual, KM_USER0); 47 kunmap_atomic(page_virtual);
48} 48}
49 49
50static void drm_cache_flush_clflush(struct page *pages[], 50static void drm_cache_flush_clflush(struct page *pages[],
@@ -87,10 +87,10 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
87 if (unlikely(page == NULL)) 87 if (unlikely(page == NULL))
88 continue; 88 continue;
89 89
90 page_virtual = kmap_atomic(page, KM_USER0); 90 page_virtual = kmap_atomic(page);
91 flush_dcache_range((unsigned long)page_virtual, 91 flush_dcache_range((unsigned long)page_virtual,
92 (unsigned long)page_virtual + PAGE_SIZE); 92 (unsigned long)page_virtual + PAGE_SIZE);
93 kunmap_atomic(page_virtual, KM_USER0); 93 kunmap_atomic(page_virtual);
94 } 94 }
95#else 95#else
96 printk(KERN_ERR "Architecture has no drm_cache.c support\n"); 96 printk(KERN_ERR "Architecture has no drm_cache.c support\n");
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index 2f75d203a2bf..c10cf5e2443a 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -309,11 +309,11 @@ int ttm_tt_swapin(struct ttm_tt *ttm)
309 goto out_err; 309 goto out_err;
310 310
311 preempt_disable(); 311 preempt_disable();
312 from_virtual = kmap_atomic(from_page, KM_USER0); 312 from_virtual = kmap_atomic(from_page);
313 to_virtual = kmap_atomic(to_page, KM_USER1); 313 to_virtual = kmap_atomic(to_page);
314 memcpy(to_virtual, from_virtual, PAGE_SIZE); 314 memcpy(to_virtual, from_virtual, PAGE_SIZE);
315 kunmap_atomic(to_virtual, KM_USER1); 315 kunmap_atomic(to_virtual);
316 kunmap_atomic(from_virtual, KM_USER0); 316 kunmap_atomic(from_virtual);
317 preempt_enable(); 317 preempt_enable();
318 page_cache_release(from_page); 318 page_cache_release(from_page);
319 } 319 }
@@ -365,11 +365,11 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage)
365 goto out_err; 365 goto out_err;
366 } 366 }
367 preempt_disable(); 367 preempt_disable();
368 from_virtual = kmap_atomic(from_page, KM_USER0); 368 from_virtual = kmap_atomic(from_page);
369 to_virtual = kmap_atomic(to_page, KM_USER1); 369 to_virtual = kmap_atomic(to_page);
370 memcpy(to_virtual, from_virtual, PAGE_SIZE); 370 memcpy(to_virtual, from_virtual, PAGE_SIZE);
371 kunmap_atomic(to_virtual, KM_USER1); 371 kunmap_atomic(to_virtual);
372 kunmap_atomic(from_virtual, KM_USER0); 372 kunmap_atomic(from_virtual);
373 preempt_enable(); 373 preempt_enable();
374 set_page_dirty(to_page); 374 set_page_dirty(to_page);
375 mark_page_accessed(to_page); 375 mark_page_accessed(to_page);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c
index f4e7763a7694..51c9ba5cd2fb 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c
@@ -136,10 +136,10 @@ static int vmw_gmr_build_descriptors(struct list_head *desc_pages,
136 136
137 if (likely(page_virtual != NULL)) { 137 if (likely(page_virtual != NULL)) {
138 desc_virtual->ppn = page_to_pfn(page); 138 desc_virtual->ppn = page_to_pfn(page);
139 kunmap_atomic(page_virtual, KM_USER0); 139 kunmap_atomic(page_virtual);
140 } 140 }
141 141
142 page_virtual = kmap_atomic(page, KM_USER0); 142 page_virtual = kmap_atomic(page);
143 desc_virtual = page_virtual - 1; 143 desc_virtual = page_virtual - 1;
144 prev_pfn = ~(0UL); 144 prev_pfn = ~(0UL);
145 145
@@ -169,7 +169,7 @@ static int vmw_gmr_build_descriptors(struct list_head *desc_pages,
169 } 169 }
170 170
171 if (likely(page_virtual != NULL)) 171 if (likely(page_virtual != NULL))
172 kunmap_atomic(page_virtual, KM_USER0); 172 kunmap_atomic(page_virtual);
173 173
174 return 0; 174 return 0;
175out_err: 175out_err: