diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c index 975a2547b8cd..ba6b390a1fef 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c | |||
@@ -435,7 +435,7 @@ gf100_fifo_recover_work(struct work_struct *work) | |||
435 | { | 435 | { |
436 | struct gf100_fifo *fifo = container_of(work, typeof(*fifo), fault); | 436 | struct gf100_fifo *fifo = container_of(work, typeof(*fifo), fault); |
437 | struct nvkm_device *device = fifo->base.engine.subdev.device; | 437 | struct nvkm_device *device = fifo->base.engine.subdev.device; |
438 | struct nvkm_object *engine; | 438 | struct nvkm_engine *engine; |
439 | unsigned long flags; | 439 | unsigned long flags; |
440 | u32 engn, engm = 0; | 440 | u32 engn, engm = 0; |
441 | u64 mask, todo; | 441 | u64 mask, todo; |
@@ -450,9 +450,9 @@ gf100_fifo_recover_work(struct work_struct *work) | |||
450 | nvkm_mask(device, 0x002630, engm, engm); | 450 | nvkm_mask(device, 0x002630, engm, engm); |
451 | 451 | ||
452 | for (todo = mask; engn = __ffs64(todo), todo; todo &= ~(1 << engn)) { | 452 | for (todo = mask; engn = __ffs64(todo), todo; todo &= ~(1 << engn)) { |
453 | if ((engine = (void *)nvkm_engine(fifo, engn))) { | 453 | if ((engine = nvkm_device_engine(device, engn))) { |
454 | nvkm_object_fini(engine, false); | 454 | nvkm_subdev_fini(&engine->subdev, false); |
455 | WARN_ON(nvkm_object_init(engine)); | 455 | WARN_ON(nvkm_subdev_init(&engine->subdev)); |
456 | } | 456 | } |
457 | } | 457 | } |
458 | 458 | ||