diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 04:54:16 (GMT) |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 02:40:34 (GMT) |
commit | f0290215c44370ff5d55c01a13dc5a44a1f86efa (patch) | |
tree | 1ca4e8c4d8d6fda268eaf040d7b3576156a71f99 /drivers/gpu/drm/nouveau/nvkm/engine/fifo | |
parent | cbea21e2ab658ca1256bfe5f4c535b2b1b9e4060 (diff) | |
download | linux-f0290215c44370ff5d55c01a13dc5a44a1f86efa.tar.xz |
drm/nouveau/subdev: implement support for new-style nvkm_subdev
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/fifo')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c index dd7fe30..975a254 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c +++ b/drivers/gpu/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/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c index 9d75dba..216205c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c +++ b/drivers/gpu/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; |