These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nv50_fence.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nv50_fence.c b/kernel/drivers/gpu/drm/nouveau/nv50_fence.c
index a82d9ea..f0d96e5 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nv50_fence.c
+++ b/kernel/drivers/gpu/drm/nouveau/nv50_fence.c
@@ -51,7 +51,7 @@ nv50_fence_context_new(struct nouveau_channel *chan)
        fctx->base.read = nv10_fence_read;
        fctx->base.sync = nv17_fence_sync;
 
-       ret = nvif_object_init(chan->object, NULL, NvSema, NV_DMA_IN_MEMORY,
+       ret = nvif_object_init(&chan->user, NvSema, NV_DMA_IN_MEMORY,
                               &(struct nv_dma_v0) {
                                        .target = NV_DMA_V0_TARGET_VRAM,
                                        .access = NV_DMA_V0_ACCESS_RDWR,
@@ -66,7 +66,7 @@ nv50_fence_context_new(struct nouveau_channel *chan)
                u32 start = bo->bo.mem.start * PAGE_SIZE;
                u32 limit = start + bo->bo.mem.size - 1;
 
-               ret = nvif_object_init(chan->object, NULL, NvEvoSema0 + i,
+               ret = nvif_object_init(&chan->user, NvEvoSema0 + i,
                                       NV_DMA_IN_MEMORY, &(struct nv_dma_v0) {
                                                .target = NV_DMA_V0_TARGET_VRAM,
                                                .access = NV_DMA_V0_ACCESS_RDWR,