Commits · ac35d19fe871c81b9d78053d675095b597270304 · Kirill Smelkov / linux

12 Feb, 2021 1 commit

Merge branch '00.00-inst' of git://github.com/skeggsb/linux into drm-next · ac35d19f

Dave Airlie authored Feb 12, 2021

Ben wrote:
The problem is that GA100 added enough new engine types and instances
that we would have begun to overflow various u64 bitfields used to
track the connections between various engines.

Rather than addressing subdevs by a unique index, we give
each subdev a type and instance id, and replace the use of bitfields
tied to subdev index with other methods.

Notable changes:
- replace subdev index with subdev type + instance id
- engines that turn out to be fused-off (can't detect until later in
init) no longer leave dangling pointers around
- new subdev/instance additions no longer need to be made in multiple places
- ampere engine topology is now being parsed
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv4c_Y923ng0rT1y23wktHHyjEMsusb0=9Z7kQaVbxyPyQ@mail.gmail.com

ac35d19f

11 Feb, 2021 39 commits

drm/nouveau/top/ga100: initial support · f6df392d

Ben Skeggs authored Feb 08, 2021

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>

f6df392d

drm/nouveau/top: add ioctrl/nvjpg · 18618fc6

Ben Skeggs authored Feb 08, 2021

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>

18618fc6

drm/nouveau/privring: rename from ibus · 26fbb4c8

Ben Skeggs authored Jan 16, 2021

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>

26fbb4c8

drm/nouveau/nvkm: remove nvkm_subdev.index · 5ef25f06

Ben Skeggs authored Feb 08, 2021

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>

5ef25f06

drm/nouveau/nvkm: determine subdev id/order from layout · be0ed63f
Ben Skeggs authored Dec 06, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
be0ed63f
drm/nouveau/vic: switch to instanced constructor · 0fa5680c
Ben Skeggs authored Feb 04, 2021
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
0fa5680c
drm/nouveau/sw: switch to instanced constructor · 8d6461d8
Ben Skeggs authored Dec 04, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
8d6461d8
drm/nouveau/sec2: switch to instanced constructor · d1866250
Ben Skeggs authored Dec 04, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
d1866250
drm/nouveau/sec: switch to instanced constructor · 400c2a45
Ben Skeggs authored Feb 04, 2021
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
400c2a45
drm/nouveau/pm: switch to instanced constructor · e73d371a
Ben Skeggs authored Dec 04, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
e73d371a
drm/nouveau/nvenc: switch to instanced constructor · ee532a8d
Ben Skeggs authored Dec 04, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
ee532a8d
drm/nouveau/nvdec: switch to instanced constructor · f8aeb133
Ben Skeggs authored Dec 04, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
f8aeb133
drm/nouveau/msvld: switch to instanced constructor · b15147bd
Ben Skeggs authored Feb 04, 2021
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
b15147bd
drm/nouveau/msppp: switch to instanced constructor · 07a356bb
Ben Skeggs authored Feb 04, 2021
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
07a356bb
drm/nouveau/mspdec: switch to instanced constructor · 96321606
Ben Skeggs authored Feb 04, 2021
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
96321606
drm/nouveau/msenc: switch to instanced constructor · e9e9a219
Ben Skeggs authored Feb 04, 2021
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
e9e9a219
drm/nouveau/mpeg: switch to instanced constructor · e5e95a76
Ben Skeggs authored Feb 04, 2021
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
e5e95a76
drm/nouveau/me: switch to instanced constructor · aba5e97b
Ben Skeggs authored Dec 04, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
aba5e97b
drm/nouveau/ifb: switch to instanced constructor · ee307030
Ben Skeggs authored Dec 04, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
ee307030
drm/nouveau/gr: switch to instanced constructor · 864d37c3
Ben Skeggs authored Dec 04, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
864d37c3
drm/nouveau/fifo/gk104-: remove use of subdev index in runlist topology info · f8fabd31
Ben Skeggs authored Feb 08, 2021
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
f8fabd31
drm/nouveau/fifo/gk104-: switch dev_top fault handling to type+inst · ba083ec7
Ben Skeggs authored Feb 08, 2021
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
ba083ec7
drm/nouveau/fifo/gf100-: switch static mmu fault id list to type+inst · 088bfe43
Ben Skeggs authored Feb 06, 2021
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
088bfe43

drm/nouveau/fifo/gf100: use fifo engine id for engine recovery mask · c6198d34

Ben Skeggs authored Feb 06, 2021

Instead of subdev index.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>

c6198d34

drm/nouveau/fifo: use type+inst to determine context pointer offsets · 73529dff
Ben Skeggs authored Feb 06, 2021
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
73529dff

drm/nouveau/fifo: turn chan subdev mask into engine mask · ad3b0d33

Ben Skeggs authored Feb 09, 2021

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>

ad3b0d33

drm/nouveau/fifo: add id_engine hook · 49616203

Ben Skeggs authored Feb 09, 2021

Will be used by common code in subsequent commits to lookup driver
engine state from HW engine ID.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>

49616203

drm/nouveau/fifo: index backend engctx by engine id · 3e7d4a0c
Ben Skeggs authored Feb 06, 2021
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
3e7d4a0c
drm/nouveau/fifo: index base engctx by engine id · 2546db0e
Ben Skeggs authored Feb 06, 2021
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
2546db0e

drm/nouveau/fifo: add engine_id hook · 64f7c698

Ben Skeggs authored Feb 06, 2021

Will be used by common code in subsequent commits to replace arrays
indexed by subdev index.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>

64f7c698

drm/nouveau/fifo: switch to instanced constructor · ab0db2bd
Ben Skeggs authored Dec 04, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
ab0db2bd
drm/nouveau/dma: switch to instanced constructor · 09f409d7
Ben Skeggs authored Dec 04, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
09f409d7
drm/nouveau/disp: switch to instanced constructor · a7f000ec
Ben Skeggs authored Feb 04, 2021
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
a7f000ec
drm/nouveau/cipher: switch to instanced constructor · 0b26ca68
Ben Skeggs authored Feb 04, 2021
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
0b26ca68

drm/nouveau/ce: make use of nvkm_subdev.inst · 608a29c2

Ben Skeggs authored Feb 04, 2021

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>

608a29c2

drm/nouveau/ce: switch to instanced constructor · 50551b15
Ben Skeggs authored Feb 04, 2021
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
50551b15
drm/nouveau/falcon: use split type+inst when looking up PRI addr · b7da823a
Ben Skeggs authored Feb 06, 2021
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
b7da823a
drm/nouveau/bsp,vp: switch to instanced constructor · fcc08a7c
Ben Skeggs authored Feb 04, 2021
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
fcc08a7c
drm/nouveau/volt: switch to instanced constructor · d07be5d7
Ben Skeggs authored Dec 04, 2020
```
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
```
d07be5d7