From ac306d3da3e0f14898de72874e99fdd522fc0b69 Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Fri, 24 Jul 2009 10:22:36 +0200 Subject: [PATCH] --- yaml --- r: 156023 b: refs/heads/master c: f121ecfebbea1452a17d57c656def7d1537440f7 h: refs/heads/master i: 156021: 750496885d2cd713a7ffff4c7f4f5b9b9aa719d4 156019: ae94422f0651d80f8434711e50030502abbc7922 156015: 342782d8db3b8151af94d1fb1f15c78325bd59b4 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/ttm/ttm_tt.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 11b6bc7ca5c6..9493883735e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73ba651fc246fcc3e446da4155e0425b4219d2c4 +refs/heads/master: f121ecfebbea1452a17d57c656def7d1537440f7 diff --git a/trunk/drivers/gpu/drm/ttm/ttm_tt.c b/trunk/drivers/gpu/drm/ttm/ttm_tt.c index 81ab81f030a3..9b2248a80cff 100644 --- a/trunk/drivers/gpu/drm/ttm/ttm_tt.c +++ b/trunk/drivers/gpu/drm/ttm/ttm_tt.c @@ -86,10 +86,16 @@ void ttm_tt_cache_flush(struct page *pages[], unsigned long num_pages) unsigned long i; for (i = 0; i < num_pages; ++i) { - if (pages[i]) { - unsigned long start = (unsigned long)page_address(pages[i]); - flush_dcache_range(start, start + PAGE_SIZE); - } + struct page *page = pages[i]; + void *page_virtual; + + if (unlikely(page == NULL)) + continue; + + page_virtual = kmap_atomic(page, KM_USER0); + flush_dcache_range((unsigned long) page_virtual, + (unsigned long) page_virtual + PAGE_SIZE); + kunmap_atomic(page_virtual, KM_USER0); } #else if (on_each_cpu(ttm_tt_ipi_handler, NULL, 1) != 0)