MALI: utgard: upgrade DDK to r7p0-00rel0

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / arm / mali400 / ump / linux / ump_kernel_linux.c

diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c
index 32a42ca6b6f7a2ef260320c8d24dc043e3c2578f..51ae9538ba7da65144d12424473c6f198bab2761 100755 (executable)
--- a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c
+++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c
@@ -347,12 +347,12 @@ static int ump_file_ioctl(struct inode *inode, struct file *filp, unsigned int c
                break;
 
        case UMP_IOC_DMABUF_IMPORT:
-               #ifdef CONFIG_DMA_SHARED_BUFFER
+#ifdef CONFIG_DMA_SHARED_BUFFER
                err = ump_dmabuf_import_wrapper((u32 __user *)argument, session_data);
-               #else
+#else
                err = -EFAULT;
                DBG_MSG(1, ("User space use dmabuf API, but kernel don't support DMA BUF\n"));
-               #endif
+#endif
                break;
 
        default:
@@ -410,13 +410,7 @@ static int ump_file_mmap(struct file *filp, struct vm_area_struct *vma)
        args.size = vma->vm_end - vma->vm_start;
        args._ukk_private = vma;
        args.secure_id = vma->vm_pgoff;
-       args.is_cached = 0;
 
-       if (!(vma->vm_flags & VM_SHARED)) {
-               args.is_cached = 1;
-               vma->vm_flags = vma->vm_flags | VM_SHARED | VM_MAYSHARE  ;
-               DBG_MSG(3, ("UMP Map function: Forcing the CPU to use cache\n"));
-       }
        /* By setting this flag, during a process fork; the child process will not have the parent UMP mappings */
        vma->vm_flags |= VM_DONTCOPY;