drm/nouveau: replace use of cpu_coherent with memory types

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 6e7e283e18b59c977fe4b3eb4da47d0ed19e9fdf..3577ab2d5d694d6a8eade4866a9037bd830d3629 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -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;