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

[linux-2.6-microblaze.git] / drivers / gpu / drm / nouveau / nouveau_bo0039.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo0039.c b/drivers/gpu/drm/nouveau/nouveau_bo0039.c
index bf7ae2c..7390132 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_bo0039.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo0039.c
@@ -36,7 +36,7 @@
 
 static inline uint32_t
 nouveau_bo_mem_ctxdma(struct ttm_buffer_object *bo,
-                     struct nouveau_channel *chan, struct ttm_mem_reg *reg)
+                     struct nouveau_channel *chan, struct ttm_resource *reg)
 {
        if (reg->mem_type == TTM_PL_TT)
                return NvDmaTT;
@@ -45,7 +45,7 @@ nouveau_bo_mem_ctxdma(struct ttm_buffer_object *bo,
 
 int
 nv04_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
-                 struct ttm_mem_reg *old_reg, struct ttm_mem_reg *new_reg)
+                 struct ttm_resource *old_reg, struct ttm_resource *new_reg)
 {
        struct nvif_push *push = chan->chan.push;
        u32 src_ctxdma = nouveau_bo_mem_ctxdma(bo, chan, old_reg);