Merge tag 'tilcdc-4.15-fixes' of https://github.com/jsarha/linux into drm-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / nouveau / nvkm / engine / fifo / changf100.h

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changf100.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changf100.h
index 7d697e2dce1ab3405686731a3955e14303a8c8bb..fc1142af02cfb1512aaf1d8a9720cfb5654e886c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changf100.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changf100.h
@@ -11,12 +11,9 @@ struct gf100_fifo_chan {
        struct list_head head;
        bool killed;
 
-       struct nvkm_gpuobj *pgd;
-       struct nvkm_vm *vm;
-
        struct {
                struct nvkm_gpuobj *inst;
-               struct nvkm_vma vma;
+               struct nvkm_vma *vma;
        } engn[NVKM_SUBDEV_NR];
 };