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

Commit 94318d50 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Dave Airlie
Browse files

drm/ttm: Clean usage of ttm_io_prot() with TTM_PL_FLAG_CACHED 



Today, most callers of ttm_io_prot() check TTM_PL_FLAG_CACHED before
calling it since on some archs it will unconditionally create non-cached
mappings.

But not all callers do which is incorrect as far as I can tell.

Instead, move that check inside ttm_io_port() itself for all archs
and make powerpc use the same implementation as ia64 and arm

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 6bd3110c

drivers/gpu/drm/ttm/ttm_bo_util.c

+7 −13
Original line number Diff line number Diff line
@@ -480,27 +480,23 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo, 


pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp)

{

	/* Cached mappings need no adjustment */

	if (caching_flags & TTM_PL_FLAG_CACHED)

		return tmp;



#if defined(__i386__) || defined(__x86_64__)

	if (caching_flags & TTM_PL_FLAG_WC)

		tmp = pgprot_writecombine(tmp);

	else if (boot_cpu_data.x86 > 3)

		tmp = pgprot_noncached(tmp);



#elif defined(__powerpc__)

	if (!(caching_flags & TTM_PL_FLAG_CACHED)) {

		pgprot_val(tmp) |= _PAGE_NO_CACHE;

		if (caching_flags & TTM_PL_FLAG_UNCACHED)

			pgprot_val(tmp) |= _PAGE_GUARDED;

	}

#endif

#if defined(__ia64__) || defined(__arm__)

#if defined(__ia64__) || defined(__arm__) || defined(__powerpc__)

	if (caching_flags & TTM_PL_FLAG_WC)

		tmp = pgprot_writecombine(tmp);

	else

		tmp = pgprot_noncached(tmp);

#endif

#if defined(__sparc__) || defined(__mips__)

	if (!(caching_flags & TTM_PL_FLAG_CACHED))

	tmp = pgprot_noncached(tmp);

#endif

	return tmp;
@@ -560,9 +556,7 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo, 
		 * We need to use vmap to get the desired page protection

		 * or to make the buffer object look contiguous.

		 */

		prot = (mem->placement & TTM_PL_FLAG_CACHED) ?

			PAGE_KERNEL :

			ttm_io_prot(mem->placement, PAGE_KERNEL);

		prot = ttm_io_prot(mem->placement, PAGE_KERNEL);

		map->bo_kmap_type = ttm_bo_map_vmap;

		map->virtual = vmap(ttm->pages + start_page, num_pages,

				    0, prot);

drivers/gpu/drm/ttm/ttm_bo_vm.c

+2 −3
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
						cvma.vm_page_prot);

	} else {

		ttm = bo->ttm;

		if (!(bo->mem.placement & TTM_PL_FLAG_CACHED))

		cvma.vm_page_prot = ttm_io_prot(bo->mem.placement,

						cvma.vm_page_prot);