3 files changed, 4 insertions, 19 deletions

diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 2a4aa57779e7..2026060f03e0 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -472,7 +472,7 @@ pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp)
         else
                 tmp = pgprot_noncached(tmp);
 #endif
-#if defined(__sparc__)
+#if defined(__sparc__) || defined(__mips__)
         if (!(caching_flags & TTM_PL_FLAG_CACHED))
                 tmp = pgprot_noncached(tmp);
 #endif
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
index d4aa5a82ab1b..b8b394319b45 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
@@ -1060,7 +1060,7 @@ int ttm_dma_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages)
 
         _manager = kzalloc(sizeof(*_manager), GFP_KERNEL);
         if (!_manager)
-                goto err_manager;
+                goto err;
 
         mutex_init(&_manager->lock);
         INIT_LIST_HEAD(&_manager->pools);
@@ -1078,9 +1078,6 @@ int ttm_dma_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages)
         }
         ttm_dma_pool_mm_shrink_init(_manager);
         return 0;
-err_manager:
-        kfree(_manager);
-        _manager = NULL;
 err:
         return ret;
 }
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index 82a529e45afe..bf8260133ea9 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -290,8 +290,6 @@ int ttm_tt_swapin(struct ttm_tt *ttm)
         struct file *swap_storage;
         struct page *from_page;
         struct page *to_page;
-        void *from_virtual;
-        void *to_virtual;
         int i;
         int ret = -ENOMEM;
 
@@ -311,11 +309,7 @@ int ttm_tt_swapin(struct ttm_tt *ttm)
                         goto out_err;
 
                 preempt_disable();
-                from_virtual = kmap_atomic(from_page);
-                to_virtual = kmap_atomic(to_page);
-                memcpy(to_virtual, from_virtual, PAGE_SIZE);
-                kunmap_atomic(to_virtual);
-                kunmap_atomic(from_virtual);
+                copy_highpage(to_page, from_page);
                 preempt_enable();
                 page_cache_release(from_page);
         }
@@ -336,8 +330,6 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage)
         struct file *swap_storage;
         struct page *from_page;
         struct page *to_page;
-        void *from_virtual;
-        void *to_virtual;
         int i;
         int ret = -ENOMEM;
 
@@ -367,11 +359,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage)
                         goto out_err;
                 }
                 preempt_disable();
-                from_virtual = kmap_atomic(from_page);
-                to_virtual = kmap_atomic(to_page);
-                memcpy(to_virtual, from_virtual, PAGE_SIZE);
-                kunmap_atomic(to_virtual);
-                kunmap_atomic(from_virtual);
+                copy_highpage(to_page, from_page);
                 preempt_enable();
                 set_page_dirty(to_page);
                 mark_page_accessed(to_page);