Merge "msm: mdss: fb: remove unused page protection flags" (3dc96032) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_fb.c

+0 −23

Original line number	Diff line number	Diff line
		@@ -1030,27 +1030,6 @@ static int mdss_fb_blank(int blank_mode, struct fb_info *info)
		return mdss_fb_blank_sub(blank_mode, info, mfd->op_enable);
		}

		/* Set VM page protection */
		static inline void __mdss_fb_set_page_protection(struct vm_area_struct *vma,
		struct msm_fb_data_type *mfd)
		{
		if (mfd->mdp_fb_page_protection == MDP_FB_PAGE_PROTECTION_WRITECOMBINE)
		vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
		else if (mfd->mdp_fb_page_protection ==
		MDP_FB_PAGE_PROTECTION_WRITETHROUGHCACHE)
		vma->vm_page_prot = pgprot_writethroughcache(vma->vm_page_prot);
		else if (mfd->mdp_fb_page_protection ==
		MDP_FB_PAGE_PROTECTION_WRITEBACKCACHE)
		vma->vm_page_prot = pgprot_writebackcache(vma->vm_page_prot);
		else if (mfd->mdp_fb_page_protection ==
		MDP_FB_PAGE_PROTECTION_WRITEBACKWACACHE)
		vma->vm_page_prot = pgprot_writebackwacache(vma->vm_page_prot);
		else
		vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);


		}

		static inline int mdss_fb_create_ion_client(struct msm_fb_data_type *mfd)
		{
		mfd->fb_ion_client = msm_ion_client_create(-1 , "mdss_fb_iclient");
		@@ -1236,8 +1215,6 @@ static int mdss_fb_fbmem_ion_mmap(struct fb_info *info,
		}
		len = min(len, remainder);

		__mdss_fb_set_page_protection(vma, mfd);

		pr_debug("vma=%p, addr=%x len=%ld",
		vma, (unsigned int)addr, len);
		pr_cont("vm_start=%x vm_end=%x vm_page_prot=%ld\n",