diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2021-02-09 13:01:01 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2021-02-11 11:49:57 +1000 |
| commit | ad3b0d331fbdf112315e3c78108d4dcc866aca3d (patch) | |
| tree | 1acebbaff223b5cb4e282a05dfec0b8443f7d85c /drivers/gpu/drm/nouveau/include | |
| parent | drm/nouveau/fifo: add id_engine hook (diff) | |
| download | linux-dev-ad3b0d331fbdf112315e3c78108d4dcc866aca3d.tar.xz linux-dev-ad3b0d331fbdf112315e3c78108d4dcc866aca3d.zip | |
drm/nouveau/fifo: turn chan subdev mask into engine mask
This data is used to know which engines/classes are reachable on a given
channel's runlist, and needs to be replaced with something that doesn't
rely on subdev index.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/include')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h index 8edfe8c1b911..54fab7cc36c1 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h @@ -18,7 +18,7 @@ struct nvkm_fifo_engn { struct nvkm_fifo_chan { const struct nvkm_fifo_chan_func *func; struct nvkm_fifo *fifo; - u64 engines; + u32 engm; struct nvkm_object object; struct list_head head; diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h index 0a8004ee8c13..b652d7c99dda 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h @@ -27,7 +27,6 @@ u32 nvkm_top_reset(struct nvkm_device *, enum nvkm_subdev_type, int); u32 nvkm_top_intr_mask(struct nvkm_device *, enum nvkm_subdev_type, int); int nvkm_top_fault_id(struct nvkm_device *, enum nvkm_devidx); enum nvkm_devidx nvkm_top_fault(struct nvkm_device *, int fault); -enum nvkm_devidx nvkm_top_engine(struct nvkm_device *, int, int *runl, int *engn); int gk104_top_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_top **); #endif |