diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-03-11 06:09:28 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-03-14 03:13:42 +0300 |
| commit | 19f89279faca691c7e5222015324b9bac60cd836 (patch) | |
| tree | e5cf277e9608c93b470f854a17b0bb90d82efa29 /drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h | |
| parent | af83a67779afce9bbf74d5b3903fc138a473ce18 (diff) | |
| download | linux-19f89279faca691c7e5222015324b9bac60cd836.tar.xz | |
drm/nouveau/fifo/gk104: make use of topology info during fault recovery
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h index cfd0f8ef9551..9e5d00ba34a2 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h @@ -11,7 +11,8 @@ struct gk104_fifo { struct { struct work_struct work; - u64 mask; + u32 engm; + u32 runm; } recover; int pbdma_nr; @@ -69,23 +70,4 @@ gk104_fifo_engine_subdev(int engine) return 0; } } - -static inline int -gk104_fifo_subdev_engine(int subdev) -{ - switch (subdev) { - case NVKM_ENGINE_GR: - case NVKM_ENGINE_SW: - case NVKM_ENGINE_CE2 : return 0; - case NVKM_ENGINE_MSPDEC: return 1; - case NVKM_ENGINE_MSPPP : return 2; - case NVKM_ENGINE_MSVLD : return 3; - case NVKM_ENGINE_CE0 : return 4; - case NVKM_ENGINE_CE1 : return 5; - case NVKM_ENGINE_MSENC : return 6; - default: - WARN_ON(1); - return 0; - } -} #endif |