diff options
| author | Ben Skeggs | 2018-05-08 12:39:46 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2018-05-18 07:01:21 +0200 |
| commit | cc36205085bb6e3a4eed1edbe413fd2235cadb27 (patch) | |
| tree | 671a9ba16943bf6c3eb84adba4dbbdd7905f5e33 /drivers/gpu/drm/nouveau/include | |
| parent | drm/nouveau/fifo/gk104-: allow fault recovery code to be called by other subdevs (diff) | |
| download | kernel-qcow2-linux-cc36205085bb6e3a4eed1edbe413fd2235cadb27.tar.gz kernel-qcow2-linux-cc36205085bb6e3a4eed1edbe413fd2235cadb27.tar.xz kernel-qcow2-linux-cc36205085bb6e3a4eed1edbe413fd2235cadb27.zip | |
drm/nouveau/fifo/gk104-: support querying engines available on each runlist
Will be used to improve channel runlist selection.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/include')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvif/cl0080.h | 7 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvif/device.h | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvif/fifo.h | 18 |
3 files changed, 30 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl0080.h b/drivers/gpu/drm/nouveau/include/nvif/cl0080.h index 5af610ea260e..49c1c90d2bde 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/cl0080.h +++ b/drivers/gpu/drm/nouveau/include/nvif/cl0080.h @@ -83,4 +83,11 @@ struct nv_device_time_v0 { /* Returns the number of available channels. */ #define NV_DEVICE_FIFO_CHANNELS NV_DEVICE_FIFO(0x00000000) + +/* Returns a mask of available runlists. */ +#define NV_DEVICE_FIFO_RUNLISTS NV_DEVICE_FIFO(0x00000001) + +/* These return a mask of engines available on a particular runlist. */ +#define NV_DEVICE_FIFO_RUNLIST_ENGINES(n) ((n) + NV_DEVICE_FIFO(0x00000010)) +#define NV_DEVICE_FIFO_RUNLIST_ENGINES__SIZE 64 #endif diff --git a/drivers/gpu/drm/nouveau/include/nvif/device.h b/drivers/gpu/drm/nouveau/include/nvif/device.h index 216dbd9fa616..76fe21e395de 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/device.h +++ b/drivers/gpu/drm/nouveau/include/nvif/device.h @@ -8,6 +8,11 @@ struct nvif_device { struct nvif_object object; struct nv_device_info_v0 info; + + struct nvif_fifo_runlist { + u64 engines; + } *runlist; + int runlists; }; int nvif_device_init(struct nvif_object *, u32 handle, s32 oclass, void *, u32, diff --git a/drivers/gpu/drm/nouveau/include/nvif/fifo.h b/drivers/gpu/drm/nouveau/include/nvif/fifo.h new file mode 100644 index 000000000000..e9468c9f9abf --- /dev/null +++ b/drivers/gpu/drm/nouveau/include/nvif/fifo.h @@ -0,0 +1,18 @@ +#ifndef __NVIF_FIFO_H__ +#define __NVIF_FIFO_H__ +#include <nvif/device.h> + +/* Returns mask of runlists that support a NV_DEVICE_INFO_ENGINE_* type. */ +u64 nvif_fifo_runlist(struct nvif_device *, u64 engine); + +/* CE-supporting runlists (excluding GRCE, if others exist). */ +static inline u64 +nvif_fifo_runlist_ce(struct nvif_device *device) +{ + u64 runmgr = nvif_fifo_runlist(device, NV_DEVICE_INFO_ENGINE_GR); + u64 runmce = nvif_fifo_runlist(device, NV_DEVICE_INFO_ENGINE_CE); + if (runmce && !(runmce &= ~runmgr)) + runmce = runmgr; + return runmce; +} +#endif |