drm/nouveau: improve handling of 64-bit BARs

Browse source

GPUs exist now with a 64-bit BAR0, which mean that BAR1 and BAR2's
indices (as passed to pci_resource_len() etc) are bumped up by one.

Modify nvkm_device.resource_addr/size() to take an enum instead of
an integer bar index, and take IORESOURCE_MEM_64 into account when
translating to the "raw" bar id.

[airlied: fixup ERR_PTR]
Signed-off-by: Ben Skeggs <bskeggs@nvidia.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Timur Tabi <ttabi@nvidia.com>
Tested-by: Timur Tabi <ttabi@nvidia.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

...

This commit is contained in:

Ben Skeggs 2025-03-21 13:35:17 +10:00 • committed by Dave Airlie

parent b1ca384772

commit 76b8f81a5b

36 changed files with 109 additions and 73 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

11

drivers/gpu/drm/nouveau/include/nvkm/core/device.h

View file

2

drivers/gpu/drm/nouveau/nouveau_abi16.c

View file

4

drivers/gpu/drm/nouveau/nouveau_bo.c

View file

4

drivers/gpu/drm/nouveau/nouveau_chan.c

View file

12

drivers/gpu/drm/nouveau/nouveau_ttm.c

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

View file

36

drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c

View file

18

drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/device/user.c

View file

2

drivers/gpu/drm/nouveau/nvkm/engine/disp/chan.c

View file

2

drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c

View file

2

drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c

View file

6

drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c

View file

2

drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h

View file

2

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c

View file

1

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c

View file

2

drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c

View file

2

drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c

View file

2

drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c

View file

2

drivers/gpu/drm/nouveau/nvkm/engine/fifo/uchan.c

View file

2

drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c

View file

2

drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c

View file

14

drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c

View file

4

drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c

View file

4

drivers/gpu/drm/nouveau/nvkm/subdev/devinit/fbmem.h

View file

2

drivers/gpu/drm/nouveau/nvkm/subdev/fault/user.c

View file

2

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/bar.c

View file

6

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c

View file

6

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gsp.c

View file

10

drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c

View file

2

drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c

View file

2

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/memgf100.c

View file

2

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/memnv04.c

View file

2

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/memnv50.c

View file

2

drivers/gpu/drm/nouveau/nvkm/subdev/vfn/uvfn.c

View file