Merge drm/drm-next into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / nouveau / nouveau_mem.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index 9dfcce1b984695d36c9965ba8a98ef94fbb6e0f5..a1049e9feee1283bca3d2f601e4317ebe8df2654 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -92,7 +92,7 @@ nouveau_mem_fini(struct nouveau_mem *mem)
 }
 
 int
-nouveau_mem_host(struct ttm_resource *reg, struct ttm_dma_tt *tt)
+nouveau_mem_host(struct ttm_resource *reg, struct ttm_tt *tt)
 {
        struct nouveau_mem *mem = nouveau_mem(reg);
        struct nouveau_cli *cli = mem->cli;
@@ -116,8 +116,10 @@ nouveau_mem_host(struct ttm_resource *reg, struct ttm_dma_tt *tt)
                mem->comp = 0;
        }
 
-       if (tt->ttm.sg) args.sgl = tt->ttm.sg->sgl;
-       else            args.dma = tt->dma_address;
+       if (tt->sg)
+               args.sgl = tt->sg->sgl;
+       else
+               args.dma = tt->dma_address;
 
        mutex_lock(&drm->master.lock);
        cli->base.super = true;