3 files changed, 18 insertions, 7 deletions

diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c
index e8f6d2229d8c..4648ed2f0143 100644
--- a/drivers/gpu/drm/ttm/ttm_agp_backend.c
+++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c
@@ -63,8 +63,7 @@ static int ttm_agp_populate(struct ttm_backend *backend,
                 if (!page)
                         page = dummy_read_page;
 
-                mem->memory[mem->page_count++] =
-                    phys_to_gart(page_to_phys(page));
+                mem->pages[mem->page_count++] = page;
         }
         agp_be->mem = mem;
         return 0;
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 1587aeca7bea..c1c407f7cca3 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -282,7 +282,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
 
                 ret = ttm_tt_set_placement_caching(bo->ttm, mem->placement);
                 if (ret)
-                        return ret;
+                        goto out_err;
 
                 if (mem->mem_type != TTM_PL_SYSTEM) {
                         ret = ttm_tt_bind(bo->ttm, mem);
@@ -527,9 +527,12 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, unsigned mem_type,
         ret = ttm_bo_wait(bo, false, interruptible, no_wait);
         spin_unlock(&bo->lock);
 
-        if (ret && ret != -ERESTART) {
-                printk(KERN_ERR TTM_PFX "Failed to expire sync object before "
-                       "buffer eviction.\n");
+        if (unlikely(ret != 0)) {
+                if (ret != -ERESTART) {
+                        printk(KERN_ERR TTM_PFX
+                               "Failed to expire sync object before "
+                               "buffer eviction.\n");
+                }
                 goto out;
         }
 
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index c27ab3a877ad..0331fa74cd3f 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -68,7 +68,7 @@ static void ttm_tt_cache_flush_clflush(struct page *pages[],
                 ttm_tt_clflush_page(*pages++);
         mb();
 }
-#else
+#elif !defined(__powerpc__)
 static void ttm_tt_ipi_handler(void *null)
 {
         ;
@@ -83,6 +83,15 @@ void ttm_tt_cache_flush(struct page *pages[], unsigned long num_pages)
                 ttm_tt_cache_flush_clflush(pages, num_pages);
                 return;
         }
+#elif defined(__powerpc__)
+        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);
+                }
+        }
 #else
         if (on_each_cpu(ttm_tt_ipi_handler, NULL, 1) != 0)
                 printk(KERN_ERR TTM_PFX