diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:16 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:37:38 +1000 |
commit | 4759e64523d65e88dd9f1a980583ad5b46cc828c (patch) | |
tree | 8b0b9e5bd73b465eed7e5522d4dc11a06512efa3 /drm/nouveau/nvkm/engine/fifo | |
parent | 8ca612ac96b0dd919e43f99ebdc812357eb91b47 (diff) | |
download | nouveau-4759e64523d65e88dd9f1a980583ad5b46cc828c.tar.gz |
subdev: implement support for new-style nvkm_subdev
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau/nvkm/engine/fifo')
-rw-r--r-- | drm/nouveau/nvkm/engine/fifo/gf100.c | 2 | ||||
-rw-r--r-- | drm/nouveau/nvkm/engine/fifo/gk104.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drm/nouveau/nvkm/engine/fifo/gf100.c b/drm/nouveau/nvkm/engine/fifo/gf100.c index dd7fe30ed..975a2547b 100644 --- a/drm/nouveau/nvkm/engine/fifo/gf100.c +++ b/drm/nouveau/nvkm/engine/fifo/gf100.c @@ -471,7 +471,7 @@ gf100_fifo_recover(struct gf100_fifo *fifo, struct nvkm_engine *engine, unsigned long flags; nvkm_error(subdev, "%s engine fault on channel %d, recovering...\n", - engine->subdev.name, chid); + nvkm_subdev_name[engine->subdev.index], chid); nvkm_mask(device, 0x003004 + (chid * 0x08), 0x00000001, 0x00000000); chan->state = KILLED; diff --git a/drm/nouveau/nvkm/engine/fifo/gk104.c b/drm/nouveau/nvkm/engine/fifo/gk104.c index 9d75dbaa0..216205cdf 100644 --- a/drm/nouveau/nvkm/engine/fifo/gk104.c +++ b/drm/nouveau/nvkm/engine/fifo/gk104.c @@ -517,7 +517,7 @@ gk104_fifo_recover(struct gk104_fifo *fifo, struct nvkm_engine *engine, unsigned long flags; nvkm_error(subdev, "%s engine fault on channel %d, recovering...\n", - nv_subdev(engine)->name, chid); + nvkm_subdev_name[nv_subdev(engine)->index], chid); nvkm_mask(device, 0x800004 + (chid * 0x08), 0x00000800, 0x00000800); chan->state = KILLED; |