diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c index 216205cdf115..62b3de4e9353 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | |||
@@ -481,7 +481,7 @@ gk104_fifo_recover_work(struct work_struct *work) | |||
481 | { | 481 | { |
482 | struct gk104_fifo *fifo = container_of(work, typeof(*fifo), fault); | 482 | struct gk104_fifo *fifo = container_of(work, typeof(*fifo), fault); |
483 | struct nvkm_device *device = fifo->base.engine.subdev.device; | 483 | struct nvkm_device *device = fifo->base.engine.subdev.device; |
484 | struct nvkm_object *engine; | 484 | struct nvkm_engine *engine; |
485 | unsigned long flags; | 485 | unsigned long flags; |
486 | u32 engn, engm = 0; | 486 | u32 engn, engm = 0; |
487 | u64 mask, todo; | 487 | u64 mask, todo; |
@@ -496,9 +496,9 @@ gk104_fifo_recover_work(struct work_struct *work) | |||
496 | nvkm_mask(device, 0x002630, engm, engm); | 496 | nvkm_mask(device, 0x002630, engm, engm); |
497 | 497 | ||
498 | for (todo = mask; engn = __ffs64(todo), todo; todo &= ~(1 << engn)) { | 498 | for (todo = mask; engn = __ffs64(todo), todo; todo &= ~(1 << engn)) { |
499 | if ((engine = (void *)nvkm_engine(fifo, engn))) { | 499 | if ((engine = nvkm_device_engine(device, engn))) { |
500 | nvkm_object_fini(engine, false); | 500 | nvkm_subdev_fini(&engine->subdev, false); |
501 | WARN_ON(nvkm_object_init(engine)); | 501 | WARN_ON(nvkm_subdev_init(&engine->subdev)); |
502 | } | 502 | } |
503 | gk104_fifo_runlist_update(fifo, gk104_fifo_engidx(fifo, engn)); | 503 | gk104_fifo_runlist_update(fifo, gk104_fifo_engidx(fifo, engn)); |
504 | } | 504 | } |