From: 杜坤明 <dkm@rockchip.com>
Date: Wed, 11 May 2011 09:00:18 +0000 (+0800)
Subject: gpu: disable the cache of cmdbuffer in gckOS_AllocateNonPagedMemory
X-Git-Tag: firefly_0821_release~10336
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=629eaf258f18ea2710405439a63854da498fa2d9;p=firefly-linux-kernel-4.4.55.git

gpu: disable the cache of cmdbuffer in gckOS_AllocateNonPagedMemory
---

diff --git a/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_os.c b/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_os.c
index 8494ffd6340b..a839dfb3482b 100755
--- a/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_os.c
+++ b/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_os.c
@@ -1296,11 +1296,7 @@ gckOS_AllocateNonPagedMemory(
     }
 
     vaddr           = (gctPOINTER)page_address(page);
-#if gcdENABLE_MEM_CACHE
-    addr            = ioremap_cached(virt_to_phys(vaddr), size);
-#else
     addr            = ioremap_nocache(virt_to_phys(vaddr), size);
-#endif
     mdl->dmaHandle  = virt_to_phys(vaddr);
     mdl->kaddr      = vaddr;
 
@@ -1430,13 +1426,7 @@ gckOS_AllocateNonPagedMemory(
         }
 #else
 
-#if (2==gcdENABLE_MEM_CACHE)
-        mdlMap->vma->vm_page_prot = pgprot_writecombine(mdlMap->vma->vm_page_prot);
-#elif (1==gcdENABLE_MEM_CACHE)
-        // NULL
-#else
         mdlMap->vma->vm_page_prot = pgprot_noncached(mdlMap->vma->vm_page_prot);
-#endif
         mdlMap->vma->vm_flags |= VM_IO | VM_DONTCOPY | VM_DONTEXPAND | VM_RESERVED;
         mdlMap->vma->vm_pgoff = 0;