Commit 04cf55e1 authored Aug 11, 2012 by Huacai Chen Committed by Dave Airlie Aug 24, 2012

drm: Handle io prot correctly for MIPS.



Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Dave Airlie <airlied@redhat.com>

parent 451023dc

drivers/gpu/drm/drm_vm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ static pgprot_t drm_io_prot(uint32_t map_type, struct vm_area_struct *vma)
		tmp = pgprot_writecombine(tmp);
		else
		tmp = pgprot_noncached(tmp);
		#elif defined(__sparc__) \|\| defined(__arm__)
		#elif defined(__sparc__) \|\| defined(__arm__) \|\| defined(__mips__)
		tmp = pgprot_noncached(tmp);
		#endif
		return tmp;

drivers/gpu/drm/ttm/ttm_bo_util.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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