drm/ttm: consolidate cache flushing code in one place.

This merges the TTM and drm cache flushing into one file in the
drm core.

Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 42 insertions, 9 deletions

diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c
index 0e994a0e46d4..3a5575e638db 100644
--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c
@@ -45,25 +45,58 @@ drm_clflush_page(struct page *page)
                 clflush(page_virtual + i);
         kunmap_atomic(page_virtual, KM_USER0);
 }
-#endif
 
+static void drm_cache_flush_clflush(struct page *pages[],
+                                    unsigned long num_pages)
+{
+        unsigned long i;
+
+        mb();
+        for (i = 0; i < num_pages; i++)
+                drm_clflush_page(*pages++);
+        mb();
+}
+
+static void
+drm_clflush_ipi_handler(void *null)
+{
+        wbinvd();
+}
+#elif !defined(__powerpc__)
+static void drm_cache_ipi_handler(void *dummy)
+{
+}
+#endif
 void
 drm_clflush_pages(struct page *pages[], unsigned long num_pages)
 {
 
 #if defined(CONFIG_X86)
         if (cpu_has_clflush) {
-                unsigned long i;
-
-                mb();
-                for (i = 0; i < num_pages; ++i)
-                        drm_clflush_page(*pages++);
-                mb();
-
+                drm_cache_flush_clflush(pages, num_pages);
                 return;
         }
 
-        wbinvd();
+        if (on_each_cpu(drm_clflush_ipi_handler, NULL, 1) != 0)
+                printk(KERN_ERR "Timed out waiting for cache flush.\n");
+
+#elif defined(__powerpc__)
+        unsigned long i;
+        for (i = 0; i < num_pages; i++) {
+                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(drm_clflush_ipi_handler, NULL, 1) != 0)
+                printk(KERN_ERR "Timed out waiting for drm cache flush\n");
 #endif
 }
 EXPORT_SYMBOL(drm_clflush_pages);