Commit acb16cfa authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: replace use of cpu_coherent with memory types 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent b3472020

drivers/gpu/drm/nouveau/nouveau_bo.c

+11 −2
Original line number Diff line number Diff line
@@ -211,8 +211,17 @@ nouveau_bo_new(struct nouveau_cli *cli, u64 size, int align, 
	nvbo->bo.bdev = &drm->ttm.bdev;

	nvbo->cli = cli;



	if (!nvxx_device(&drm->client.device)->func->cpu_coherent)

		nvbo->force_coherent = flags & TTM_PL_FLAG_UNCACHED;

	/* This is confusing, and doesn't actually mean we want an uncached

	 * mapping, but is what NOUVEAU_GEM_DOMAIN_COHERENT gets translated

	 * into in nouveau_gem_new().

	 */

	if (flags & TTM_PL_FLAG_UNCACHED) {

		/* Determine if we can get a cache-coherent map, forcing

		 * uncached mapping if we can't.

		 */

		if (mmu->type[drm->ttm.type_host].type & NVIF_MEM_UNCACHED)

			nvbo->force_coherent = true;

	}



	if (cli->device.info.family >= NV_DEVICE_INFO_V0_FERMI) {

		nvbo->kind = (tile_flags & 0x0000ff00) >> 8;