Hey, Just a couple fixes for Ampere display issues, and a long-standing race in MM paths.
Ben. The following changes since commit 7c60610d476766e128cc4284bb6349732cbd6606: Linux 5.14-rc6 (2021-08-15 13:40:53 -1000) are available in the Git repository at: git://github.com/skeggsb/linux linux-5.14 for you to fetch changes up to 59f216cf04d973b4316761cbf3e7cb9556715b7a: drm/nouveau: rip out nvkm_client.super (2021-08-18 19:00:15 +1000) ---------------------------------------------------------------- Ben Skeggs (6): drm/nouveau: recognise GA107 drm/nouveau/disp: power down unused DP links during init drm/nouveau/kms/nv50: workaround EFI GOP window channel format differences drm/nouveau/fifo/nv50-: rip out dma channels drm/nouveau: block a bunch of classes from userspace drm/nouveau: rip out nvkm_client.super drivers/gpu/drm/nouveau/dispnv50/disp.c | 27 +++++++++++ drivers/gpu/drm/nouveau/dispnv50/head.c | 13 ++++-- drivers/gpu/drm/nouveau/dispnv50/head.h | 1 + drivers/gpu/drm/nouveau/include/nvif/cl0080.h | 3 +- drivers/gpu/drm/nouveau/include/nvif/class.h | 2 - drivers/gpu/drm/nouveau/include/nvif/client.h | 1 - drivers/gpu/drm/nouveau/include/nvif/driver.h | 2 +- drivers/gpu/drm/nouveau/include/nvkm/core/client.h | 1 - drivers/gpu/drm/nouveau/include/nvkm/core/ioctl.h | 2 +- drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h | 1 - drivers/gpu/drm/nouveau/nouveau_abi16.c | 2 - drivers/gpu/drm/nouveau/nouveau_chan.c | 19 +------- drivers/gpu/drm/nouveau/nouveau_drm.c | 3 +- drivers/gpu/drm/nouveau/nouveau_mem.c | 15 +----- drivers/gpu/drm/nouveau/nouveau_nvif.c | 4 +- drivers/gpu/drm/nouveau/nouveau_svm.c | 9 ---- drivers/gpu/drm/nouveau/nouveau_usif.c | 57 +++++++++++++++++------ drivers/gpu/drm/nouveau/nvif/client.c | 3 +- drivers/gpu/drm/nouveau/nvif/object.c | 3 +- drivers/gpu/drm/nouveau/nvkm/core/ioctl.c | 4 +- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 21 +++++++++ drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h | 1 + drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c | 9 ++++ drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c | 15 ------ drivers/gpu/drm/nouveau/nvkm/engine/fifo/Kbuild | 2 - drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv50.h | 2 - drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmag84.c | 94 -------------------------------------- drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv50.c | 92 ------------------------------------- drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c | 1 - drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c | 2 - drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogv100.c | 2 - drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifotu102.c | 2 - drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c | 1 - drivers/gpu/drm/nouveau/nvkm/subdev/mmu/umem.c | 6 +-- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/umem.h | 1 - drivers/gpu/drm/nouveau/nvkm/subdev/mmu/ummu.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c | 27 +++-------- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 6 +-- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 16 +++---- 41 files changed, 144 insertions(+), 334 deletions(-) delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmag84.c delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv50.c