Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37035e74 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Daniel Vetter
Browse files

drm: Fix broken use of _PAGE_NO_CACHE on powerpc 



That constant isn't meant to be used outside of arch mm code

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1467018023.20278.65.camel@kernel.crashing.org
parent 6308c983

drivers/gpu/drm/drm_memory.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
# include <asm/agp.h>

#else

# ifdef __powerpc__

#  define PAGE_AGP	__pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)

#  define PAGE_AGP	pgprot_noncached_wc(PAGE_KERNEL)

# else

#  define PAGE_AGP	PAGE_KERNEL

# endif

drivers/gpu/drm/drm_scatter.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
static inline void *drm_vmalloc_dma(unsigned long size)

{

#if defined(__powerpc__) && defined(CONFIG_NOT_COHERENT_CACHE)

	return __vmalloc(size, GFP_KERNEL, PAGE_KERNEL | _PAGE_NO_CACHE);

	return __vmalloc(size, GFP_KERNEL, pgprot_noncached_wc(PAGE_KERNEL));

#else

	return vmalloc_32(size);

#endif

drivers/gpu/drm/drm_vm.c

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static pgprot_t drm_dma_prot(uint32_t map_type, struct vm_area_struct *vma) 
	pgprot_t tmp = vm_get_page_prot(vma->vm_flags);



#if defined(__powerpc__) && defined(CONFIG_NOT_COHERENT_CACHE)

	tmp |= _PAGE_NO_CACHE;

	tmp = pgprot_noncached_wc(tmp);

#endif

	return tmp;

}
@@ -593,7 +593,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) 
			 * pages and mappings in fault()

			 */

#if defined(__powerpc__)

			pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE;

			vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

#endif

			vma->vm_ops = &drm_vm_ops;

			break;