On 2/5/25 13:56, Dave Airlie wrote:> On Wed, 30 Apr 2025 at 09:49, Ben Skeggs <bskeggs at nvidia.com> wrote: >> This series implements support for booting GSP-RM firmware version >> 570.144, and adds support for GH100, GB10x, and GB20x GPUs. >> >> A tree containing this series is available here[1], and a temporary >> linux-firmware tree here[2]. Timur will send an official patch to >> the linux-firmware tree once this series is closer to being merged. > I've dug through this and been running in on/off over the past few weeks, > > Overall I don't think this makes things much worse, if we had to keep > adding fws I suspect this might get painful.Hey Dave, Thanks for the review, and for getting some kind of userspace in place to help shake out some of the issues in the series.> > Apart from my drm/dp patch at the end,I should probably add my R-b to that one too in a v2. Ben.> > Reviewed-by: Dave Airlie <airlied at redhat.com> > > Dave. >> The series is broken down as follows: >> >> Patch 1 is a simple fix to the condition used to wait for RM shutdown. >> It's not known to fix any issue, but kept separate in case it needs to >> be backported. >> >> Patches 2-4 bump up the maximum instance counts of various engines to >> support those available on r570 / newer HW. >> >> Patches 5-13 split up the GSP-RM code into modules (roughly) around RM >> API boundaries, and move all the r535-specific code and headers under >> nvkm/subdev/gsp/rm/r535 to make it easier to contain version-specific >> code. >> >> Patches 14-18 reduce the amount of boilerplate needed to implement >> engines and engine objects when running on GSP-RM by adding a common >> implementation which can be used for all engine types. >> >> Patches 19-20 switch to using the hInternal{Client,Device,Subdevice} >> objects returned by GSP during init instead of allocating them for >> each nvkm client, reducing the number of RPCs needed per FD open, and >> removing the need to handle changes in r570. >> >> Patches 21-44 add a bunch of simple HALs around the RMAPI calls that >> change between r535 and r570, and, finally, adds support for 570.144. >> >> Patches 45-52 add support for GH100 Hopper GPUs >> >> Patches 53-56 add support for GB10x Blackwell GPUs >> >> Patches 57-60 add support for GB20x Blackwell GPUs >> >> More details on the various changes are in the specific commit messages. >> >> [1] https://gitlab.freedesktop.org/bskeggs/nouveau/-/commits/03.01-gb20x?ref_type=heads >> [2] https://gitlab.freedesktop.org/bskeggs/linux-firmware/-/commit/1c457ce8dc792dcb57246b8e097a05d2cc4bce90 >> >> Signed-off-by: Ben Skeggs <bskeggs at nvidia.com> >> >> Ben Skeggs (59): >> drm/nouveau/gsp: fix rm shutdown wait condition >> drm/nouveau/ce: bump max instances to 20 >> drm/nouveau/nvenc: bump max instances to 4 >> drm/nouveau/ofa: bump max instances to 2 >> drm/nouveau/gsp: split rpc handling out on its own >> drm/nouveau/gsp: split rm ctrl handling out on its own >> drm/nouveau/gsp: split rm alloc handling out on its own >> drm/nouveau/gsp: split client handling out on its own >> drm/nouveau/gsp: split device handling out on its own >> drm/nouveau/gsp: move firmware loading to GPU-specific code >> drm/nouveau/gsp: move booter handling to GPU-specific code >> drm/nouveau/gsp: move subdev/engine impls to subdev/gsp/rm/r535/ >> drm/nouveau/gsp: switch to a simpler GSP-RM header layout >> drm/nouveau/gsp: add gpu hal stubs >> drm/nouveau/gsp: add display class ids to gpu hal >> drm/nouveau/gsp: add usermode class id to gpu hal >> drm/nouveau/gsp: add channel class id to gpu hal >> drm/nouveau/gsp: add common code for engines/engine objects >> drm/nouveau/gsp: ignore client engine object handles >> drm/nouveau/gsp: use internal.{client,device,subdevice} where possible >> drm/nouveau/gsp: add hal for wpr config info + meta init >> drm/nouveau/gsp: add hal for gsp.set_system_info() >> drm/nouveau/gsp: add hal for gsp.get_static_info() >> drm/nouveau/gsp: add hal for gsp.xlat_mc_engine_idx() >> drm/nouveau/gsp: add hal for gsp.drop_send_user_shared_data() >> drm/nouveau/gsp: add hal for disp.bl_ctrl() >> drm/nouveau/gsp: add hal for disp.dp.set_indexed_link_rates() >> drm/nouveau/gsp: add hal for disp.get_static_info() >> drm/nouveau/gsp: add hal for disp.chan.set_pushbuf() >> drm/nouveau/gsp: add hal for fifo.xlat_rm_engine_type() >> drm/nouveau/gsp: add hal for fifo.ectx_size() >> drm/nouveau/gsp: add hal for gr.get_ctxbufs_info() >> drm/nouveau/gsp: add hal for gsp.set_rmargs() >> drm/nouveau/gsp: add hals for fbsr.suspend/resume() >> drm/nouveau/gsp: add hal for disp.get_supported() >> drm/nouveau/gsp: add hal for disp.get_connect_state() >> drm/nouveau/gsp: add hal for disp.get_active() >> drm/nouveau/gsp: add hal for disp.dp.get_caps() >> drm/nouveau/gsp: add hal for fifo.chan.alloc >> drm/nouveau/gsp: add hal for fifo.rsvd_chids >> drm/nouveau/gsp: add hal for fifo.rc_triggered() >> drm/nouveau/gsp: add hal for disp.chan.dmac_alloc() >> drm/nouveau/gsp: add hal for gsp.sr_data_size() >> drm/nouveau/gsp: add support for 570.144 >> drm/nouveau/pci: add PRI address of config space mirror to >> nvkm_pci_func >> drm/nouveau/instmem: add hal for set_bar0_window_addr() >> drm/nouveau/mmu: bump up the maximum page table depth >> drm/nouveau/gsp: fetch level shift and PDE from BAR2 VMM >> drm/nouveau/gsp: init VMMs with NV0080_CTRL_DMA_SET_PAGE_DIRECTORY >> drm/nouveau/gv100-: switch to volta semaphore methods >> drm/nouveau: improve handling of 64-bit BARs >> drm/nouveau: add support for GH100 >> drm/nouveau: add helper functions for allocating pinned/cpu-mapped bos >> drm/nouveau/nv50-: separate CHANNEL_GPFIFO handling out from >> CHANNEL_DMA >> drm/nouveau/gf100-: track chan progress with non-WFI semaphore release >> drm/nouveau: add support for GB10x >> drm/nouveau/gsp: add hal for fifo.chan.doorbell_handle >> drm/nouveau: add support for GB20x >> drm/nouveau/kms: add support for GB20x >> >> Dave Airlie (1): >> drm/dp: add option to disable zero sized address only transactions. >> >> drivers/gpu/drm/display/drm_dp_helper.c | 39 +- >> drivers/gpu/drm/nouveau/Kbuild | 2 + >> drivers/gpu/drm/nouveau/dispnv04/crtc.c | 22 +- >> drivers/gpu/drm/nouveau/dispnv50/Kbuild | 4 + >> drivers/gpu/drm/nouveau/dispnv50/core.c | 1 + >> drivers/gpu/drm/nouveau/dispnv50/core.h | 6 + >> drivers/gpu/drm/nouveau/dispnv50/core507d.c | 1 + >> drivers/gpu/drm/nouveau/dispnv50/corec37d.c | 3 +- >> drivers/gpu/drm/nouveau/dispnv50/corec57d.c | 2 + >> drivers/gpu/drm/nouveau/dispnv50/coreca7d.c | 139 ++ >> drivers/gpu/drm/nouveau/dispnv50/crc.c | 4 + >> drivers/gpu/drm/nouveau/dispnv50/crc.h | 1 + >> drivers/gpu/drm/nouveau/dispnv50/crcca7d.c | 115 ++ >> drivers/gpu/drm/nouveau/dispnv50/curs.c | 1 + >> drivers/gpu/drm/nouveau/dispnv50/disp.c | 30 +- >> drivers/gpu/drm/nouveau/dispnv50/head.c | 1 + >> drivers/gpu/drm/nouveau/dispnv50/head.h | 5 + >> drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 2 +- >> drivers/gpu/drm/nouveau/dispnv50/headca7d.c | 314 ++++ >> drivers/gpu/drm/nouveau/dispnv50/wimm.c | 1 + >> drivers/gpu/drm/nouveau/dispnv50/wndw.c | 25 +- >> drivers/gpu/drm/nouveau/dispnv50/wndw.h | 3 + >> drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 1 + >> drivers/gpu/drm/nouveau/dispnv50/wndwca7e.c | 226 +++ >> drivers/gpu/drm/nouveau/gv100_fence.c | 110 ++ >> .../drm/nouveau/include/nvhw/class/clc36f.h | 52 + >> .../drm/nouveau/include/nvhw/class/clc97b.h | 22 + >> .../drm/nouveau/include/nvhw/class/clca7d.h | 868 +++++++++ >> .../drm/nouveau/include/nvhw/class/clca7e.h | 137 ++ >> .../include/nvhw/ref/gb100/dev_hshub_base.h | 28 + >> .../include/nvhw/ref/gb10b/dev_fbhub.h | 18 + >> .../nouveau/include/nvhw/ref/gb202/dev_ce.h | 12 + >> .../include/nvhw/ref/gb202/dev_therm.h | 17 + >> .../include/nvhw/ref/gh100/dev_falcon_v4.h | 20 + >> .../nouveau/include/nvhw/ref/gh100/dev_fb.h | 15 + >> .../include/nvhw/ref/gh100/dev_fsp_pri.h | 28 + >> .../nouveau/include/nvhw/ref/gh100/dev_mmu.h | 173 ++ >> .../include/nvhw/ref/gh100/dev_riscv_pri.h | 14 + >> .../include/nvhw/ref/gh100/dev_therm.h | 17 + >> .../include/nvhw/ref/gh100/dev_xtl_ep_pri.h | 10 + >> .../include/nvhw/ref/gh100/pri_nv_xal_ep.h | 13 + >> drivers/gpu/drm/nouveau/include/nvif/chan.h | 76 + >> drivers/gpu/drm/nouveau/include/nvif/cl0080.h | 5 +- >> drivers/gpu/drm/nouveau/include/nvif/class.h | 35 + >> drivers/gpu/drm/nouveau/include/nvif/object.h | 2 +- >> drivers/gpu/drm/nouveau/include/nvif/push.h | 14 +- >> .../gpu/drm/nouveau/include/nvif/push906f.h | 1 + >> .../gpu/drm/nouveau/include/nvif/pushc97b.h | 18 + >> .../drm/nouveau/include/nvkm/core/device.h | 17 +- >> .../drm/nouveau/include/nvkm/core/layout.h | 7 +- >> .../drm/nouveau/include/nvkm/engine/disp.h | 4 - >> .../gpu/drm/nouveau/include/nvkm/engine/gr.h | 1 - >> .../drm/nouveau/include/nvkm/engine/nvdec.h | 2 - >> .../drm/nouveau/include/nvkm/engine/nvenc.h | 2 - >> .../drm/nouveau/include/nvkm/engine/nvjpg.h | 8 - >> .../gpu/drm/nouveau/include/nvkm/engine/ofa.h | 9 - >> .../gpu/drm/nouveau/include/nvkm/subdev/fb.h | 3 + >> .../gpu/drm/nouveau/include/nvkm/subdev/fsp.h | 24 + >> .../gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 84 +- >> .../drm/nouveau/include/nvkm/subdev/instmem.h | 6 +- >> .../gpu/drm/nouveau/include/nvkm/subdev/mmu.h | 11 +- >> .../gpu/drm/nouveau/include/nvkm/subdev/pci.h | 1 + >> .../common/sdk/nvidia/inc/class/cl0080.h | 43 - >> .../nvidia/inc/class/cl2080_notification.h | 62 - >> .../common/sdk/nvidia/inc/class/clc0b5sw.h | 34 - >> .../nvidia/inc/ctrl/ctrl0073/ctrl0073common.h | 39 - >> .../nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h | 166 -- >> .../sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h | 335 ---- >> .../inc/ctrl/ctrl0073/ctrl0073specific.h | 216 --- >> .../nvidia/inc/ctrl/ctrl0073/ctrl0073system.h | 65 - >> .../nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h | 48 - >> .../nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h | 40 - >> .../nvidia/inc/ctrl/ctrl2080/ctrl2080event.h | 41 - >> .../sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h | 51 - >> .../nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h | 52 - >> .../nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h | 100 -- >> .../sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h | 41 - >> .../inc/ctrl/ctrl2080/ctrl2080internal.h | 162 -- >> .../common/sdk/nvidia/inc/ctrl/ctrl90f1.h | 95 - >> .../nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h | 42 - >> .../535.113.01/common/sdk/nvidia/inc/nvos.h | 148 -- >> .../common/shared/msgq/inc/msgq/msgq_priv.h | 97 - >> .../uproc/os/common/include/libos_init_args.h | 52 - >> .../nvalloc/common/inc/gsp/gsp_fw_sr_meta.h | 79 - >> .../nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h | 170 -- >> .../arch/nvalloc/common/inc/rmRiscvUcode.h | 82 - >> .../nvidia/arch/nvalloc/common/inc/rmgspseq.h | 100 -- >> .../nvidia/generated/g_allclasses.h | 33 - >> .../535.113.01/nvidia/generated/g_fbsr_nvoc.h | 31 - >> .../nvidia/generated/g_kernel_channel_nvoc.h | 62 - >> .../nvidia/generated/g_kernel_fifo_nvoc.h | 119 -- >> .../nvidia/generated/g_mem_desc_nvoc.h | 32 - >> .../nvidia/generated/g_rpc-structures.h | 124 -- >> .../nvidia/inc/kernel/gpu/gpu_acpi_data.h | 74 - >> .../nvidia/inc/kernel/gpu/gpu_engine_type.h | 86 - >> .../nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h | 33 - >> .../nvidia/inc/kernel/gpu/gsp/gsp_init_args.h | 57 - >> .../inc/kernel/gpu/gsp/gsp_static_config.h | 174 -- >> .../nvidia/inc/kernel/gpu/intr/engine_idx.h | 57 - >> .../nvidia/inc/kernel/gpu/nvbitmask.h | 33 - >> .../gpu/drm/nouveau/include/nvrm/nvtypes.h | 2 + >> drivers/gpu/drm/nouveau/nouveau_abi16.c | 14 +- >> drivers/gpu/drm/nouveau/nouveau_bo.c | 84 +- >> drivers/gpu/drm/nouveau/nouveau_bo.h | 7 + >> drivers/gpu/drm/nouveau/nouveau_chan.c | 99 +- >> drivers/gpu/drm/nouveau/nouveau_chan.h | 16 +- >> drivers/gpu/drm/nouveau/nouveau_connector.c | 2 + >> drivers/gpu/drm/nouveau/nouveau_dma.c | 103 +- >> drivers/gpu/drm/nouveau/nouveau_dma.h | 13 +- >> drivers/gpu/drm/nouveau/nouveau_dmem.c | 18 +- >> drivers/gpu/drm/nouveau/nouveau_drm.c | 7 +- >> drivers/gpu/drm/nouveau/nouveau_exec.c | 12 +- >> drivers/gpu/drm/nouveau/nouveau_fence.h | 1 + >> drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +- >> drivers/gpu/drm/nouveau/nouveau_ttm.c | 12 +- >> drivers/gpu/drm/nouveau/nv10_fence.c | 6 +- >> drivers/gpu/drm/nouveau/nv17_fence.c | 15 +- >> drivers/gpu/drm/nouveau/nv50_fence.c | 15 +- >> drivers/gpu/drm/nouveau/nv84_fence.c | 19 +- >> drivers/gpu/drm/nouveau/nvif/Kbuild | 6 + >> drivers/gpu/drm/nouveau/nvif/chan.c | 173 ++ >> drivers/gpu/drm/nouveau/nvif/chan506f.c | 89 + >> drivers/gpu/drm/nouveau/nvif/chan906f.c | 110 ++ >> drivers/gpu/drm/nouveau/nvif/chanc36f.c | 94 + >> drivers/gpu/drm/nouveau/nvif/disp.c | 1 + >> drivers/gpu/drm/nouveau/nvif/user.c | 8 +- >> drivers/gpu/drm/nouveau/nvkm/engine/Kbuild | 2 - >> drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild | 3 +- >> .../gpu/drm/nouveau/nvkm/engine/ce/ga100.c | 2 +- >> .../gpu/drm/nouveau/nvkm/engine/ce/ga102.c | 2 +- >> .../engine/ce/gb202.c} | 22 +- >> drivers/gpu/drm/nouveau/nvkm/engine/ce/priv.h | 2 + >> drivers/gpu/drm/nouveau/nvkm/engine/ce/r535.c | 108 -- >> .../gpu/drm/nouveau/nvkm/engine/ce/tu102.c | 2 +- >> .../gpu/drm/nouveau/nvkm/engine/device/base.c | 189 +- >> .../gpu/drm/nouveau/nvkm/engine/device/pci.c | 32 +- >> .../gpu/drm/nouveau/nvkm/engine/device/priv.h | 3 +- >> .../drm/nouveau/nvkm/engine/device/tegra.c | 18 +- >> .../gpu/drm/nouveau/nvkm/engine/device/user.c | 9 +- >> .../gpu/drm/nouveau/nvkm/engine/disp/Kbuild | 3 - >> .../gpu/drm/nouveau/nvkm/engine/disp/ad102.c | 52 - >> .../gpu/drm/nouveau/nvkm/engine/disp/chan.c | 2 +- >> .../gpu/drm/nouveau/nvkm/engine/disp/gv100.c | 2 +- >> .../gpu/drm/nouveau/nvkm/engine/disp/outp.c | 2 +- >> .../gpu/drm/nouveau/nvkm/engine/disp/uconn.c | 4 +- >> .../gpu/drm/nouveau/nvkm/engine/fifo/Kbuild | 3 +- >> .../gpu/drm/nouveau/nvkm/engine/fifo/base.c | 2 +- >> .../gpu/drm/nouveau/nvkm/engine/fifo/chan.c | 6 +- >> .../gpu/drm/nouveau/nvkm/engine/fifo/chan.h | 2 +- >> .../nvlimits.h => nvkm/engine/fifo/gb202.c} | 24 +- >> .../gpu/drm/nouveau/nvkm/engine/fifo/gf100.c | 2 +- >> .../gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 4 +- >> .../gpu/drm/nouveau/nvkm/engine/fifo/gv100.c | 1 - >> .../gpu/drm/nouveau/nvkm/engine/fifo/nv04.c | 2 +- >> .../gpu/drm/nouveau/nvkm/engine/fifo/nv40.c | 2 +- >> .../gpu/drm/nouveau/nvkm/engine/fifo/nv50.c | 2 +- >> .../gpu/drm/nouveau/nvkm/engine/fifo/priv.h | 4 + >> .../gpu/drm/nouveau/nvkm/engine/fifo/tu102.c | 2 +- >> .../gpu/drm/nouveau/nvkm/engine/fifo/uchan.c | 2 +- >> drivers/gpu/drm/nouveau/nvkm/engine/gr/Kbuild | 3 - >> .../gpu/drm/nouveau/nvkm/engine/gr/ga102.c | 2 +- >> .../gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 2 - >> drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c | 2 +- >> drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c | 2 +- >> drivers/gpu/drm/nouveau/nvkm/engine/gr/r535.c | 508 ------ >> .../gpu/drm/nouveau/nvkm/engine/gr/tu102.c | 2 +- >> .../gpu/drm/nouveau/nvkm/engine/nvdec/Kbuild | 4 - >> .../gpu/drm/nouveau/nvkm/engine/nvdec/ga102.c | 12 +- >> .../gpu/drm/nouveau/nvkm/engine/nvdec/priv.h | 3 - >> .../gpu/drm/nouveau/nvkm/engine/nvdec/r535.c | 110 -- >> .../gpu/drm/nouveau/nvkm/engine/nvdec/tu102.c | 12 +- >> .../gpu/drm/nouveau/nvkm/engine/nvenc/Kbuild | 4 - >> .../gpu/drm/nouveau/nvkm/engine/nvenc/ga102.c | 44 - >> .../gpu/drm/nouveau/nvkm/engine/nvenc/priv.h | 3 - >> .../gpu/drm/nouveau/nvkm/engine/nvenc/r535.c | 110 -- >> .../gpu/drm/nouveau/nvkm/engine/nvenc/tu102.c | 12 +- >> .../gpu/drm/nouveau/nvkm/engine/nvjpg/Kbuild | 5 - >> .../gpu/drm/nouveau/nvkm/engine/nvjpg/ad102.c | 44 - >> .../gpu/drm/nouveau/nvkm/engine/nvjpg/ga100.c | 44 - >> .../gpu/drm/nouveau/nvkm/engine/nvjpg/priv.h | 8 - >> .../gpu/drm/nouveau/nvkm/engine/nvjpg/r535.c | 107 -- >> .../gpu/drm/nouveau/nvkm/engine/ofa/Kbuild | 6 - >> .../gpu/drm/nouveau/nvkm/engine/ofa/ad102.c | 44 - >> .../gpu/drm/nouveau/nvkm/engine/ofa/ga100.c | 44 - >> .../gpu/drm/nouveau/nvkm/engine/ofa/ga102.c | 44 - >> .../gpu/drm/nouveau/nvkm/engine/ofa/priv.h | 8 - >> .../gpu/drm/nouveau/nvkm/engine/ofa/r535.c | 107 -- >> drivers/gpu/drm/nouveau/nvkm/subdev/Kbuild | 1 + >> .../gpu/drm/nouveau/nvkm/subdev/bar/Kbuild | 2 - >> .../gpu/drm/nouveau/nvkm/subdev/bar/gf100.c | 14 +- >> .../gpu/drm/nouveau/nvkm/subdev/bar/nv50.c | 4 +- >> .../drm/nouveau/nvkm/subdev/devinit/fbmem.h | 4 +- >> .../gpu/drm/nouveau/nvkm/subdev/fault/user.c | 2 +- >> drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | 3 + >> .../gpu/drm/nouveau/nvkm/subdev/fb/ga102.c | 2 +- >> .../gpu/drm/nouveau/nvkm/subdev/fb/gb100.c | 51 + >> .../g_os_nvoc.h => nvkm/subdev/fb/gb202.c} | 45 +- >> .../subdev/fb/gh100.c} | 46 +- >> drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | 2 + >> .../gpu/drm/nouveau/nvkm/subdev/fsp/Kbuild | 8 + >> .../gpu/drm/nouveau/nvkm/subdev/fsp/base.c | 83 + >> .../g_gpu_nvoc.h => nvkm/subdev/fsp/gb100.c} | 34 +- >> .../rpc_headers.h => nvkm/subdev/fsp/gb202.c} | 63 +- >> .../gpu/drm/nouveau/nvkm/subdev/fsp/gh100.c | 292 +++ >> .../gpu/drm/nouveau/nvkm/subdev/fsp/priv.h | 29 + >> .../gpu/drm/nouveau/nvkm/subdev/gsp/Kbuild | 5 +- >> .../gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c | 27 +- >> .../gpu/drm/nouveau/nvkm/subdev/gsp/base.c | 42 +- >> .../gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c | 17 +- >> .../gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c | 27 +- >> .../subdev/gsp/gb100.c} | 48 +- >> .../gpu/drm/nouveau/nvkm/subdev/gsp/gb202.c | 55 + >> .../gpu/drm/nouveau/nvkm/subdev/gsp/gh100.c | 381 ++++ >> .../gpu/drm/nouveau/nvkm/subdev/gsp/priv.h | 41 +- >> .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/Kbuild | 18 + >> .../cl0000.h => nvkm/subdev/gsp/rm/ad10x.c} | 50 +- >> .../drm/nouveau/nvkm/subdev/gsp/rm/engine.c | 206 +++ >> .../drm/nouveau/nvkm/subdev/gsp/rm/engine.h | 20 + >> .../cl84a0.h => nvkm/subdev/gsp/rm/ga100.c} | 34 +- >> .../drm/nouveau/nvkm/subdev/gsp/rm/ga1xx.c | 56 + >> .../drm/nouveau/nvkm/subdev/gsp/rm/gb10x.c | 47 + >> .../drm/nouveau/nvkm/subdev/gsp/rm/gb20x.c | 61 + >> .../cl0005.h => nvkm/subdev/gsp/rm/gh100.c} | 41 +- >> .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/gpu.h | 70 + >> .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/gr.c | 73 + >> .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/gr.h | 42 + >> .../drm/nouveau/nvkm/subdev/gsp/rm/nvdec.c | 50 + >> .../drm/nouveau/nvkm/subdev/gsp/rm/nvenc.c | 50 + >> .../nouveau/nvkm/subdev/gsp/rm/r535/Kbuild | 25 + >> .../nouveau/nvkm/subdev/gsp/rm/r535/alloc.c | 112 ++ >> .../subdev/{bar/r535.c => gsp/rm/r535/bar.c} | 41 +- >> .../drm/nouveau/nvkm/subdev/gsp/rm/r535/ce.c | 46 + >> .../nouveau/nvkm/subdev/gsp/rm/r535/client.c | 79 + >> .../nouveau/nvkm/subdev/gsp/rm/r535/ctrl.c | 93 + >> .../nouveau/nvkm/subdev/gsp/rm/r535/device.c | 148 ++ >> .../disp/r535.c => subdev/gsp/rm/r535/disp.c} | 409 +++-- >> .../{instmem/r535.c => gsp/rm/r535/fbsr.c} | 58 +- >> .../fifo/r535.c => subdev/gsp/rm/r535/fifo.c} | 308 ++-- >> .../drm/nouveau/nvkm/subdev/gsp/rm/r535/gr.c | 372 ++++ >> .../nvkm/subdev/gsp/{r535.c => rm/r535/gsp.c} | 1586 ++--------------- >> .../ad102.c => subdev/gsp/rm/r535/nvdec.c} | 35 +- >> .../gr/ad102.c => subdev/gsp/rm/r535/nvenc.c} | 37 +- >> .../ga100.c => subdev/gsp/rm/r535/nvjpg.c} | 35 +- >> .../nvkm/subdev/gsp/rm/r535/nvrm/alloc.h | 36 + >> .../nvkm/subdev/gsp/rm/r535/nvrm/bar.h | 29 + >> .../nouveau/nvkm/subdev/gsp/rm/r535/nvrm/ce.h | 15 + >> .../nvkm/subdev/gsp/rm/r535/nvrm/client.h | 20 + >> .../nvkm/subdev/gsp/rm/r535/nvrm/ctrl.h | 21 + >> .../nvkm/subdev/gsp/rm/r535/nvrm/device.h | 30 + >> .../nvkm/subdev/gsp/rm/r535/nvrm/disp.h | 741 ++++++++ >> .../nvkm/subdev/gsp/rm/r535/nvrm/engine.h | 260 +++ >> .../nvkm/subdev/gsp/rm/r535/nvrm/event.h | 47 + >> .../nvkm/subdev/gsp/rm/r535/nvrm/fbsr.h | 106 ++ >> .../nvkm/subdev/gsp/rm/r535/nvrm/fifo.h | 350 ++++ >> .../nouveau/nvkm/subdev/gsp/rm/r535/nvrm/gr.h | 73 + >> .../nvkm/subdev/gsp/rm/r535/nvrm/gsp.h | 825 +++++++++ >> .../nvkm/subdev/gsp/rm/r535/nvrm/msgfn.h | 53 + >> .../nvkm/subdev/gsp/rm/r535/nvrm/nvdec.h | 17 + >> .../nvkm/subdev/gsp/rm/r535/nvrm/nvenc.h | 17 + >> .../nvkm/subdev/gsp/rm/r535/nvrm/nvjpg.h | 17 + >> .../nvkm/subdev/gsp/rm/r535/nvrm/ofa.h | 16 + >> .../subdev/gsp/rm/r535/nvrm/rpcfn.h} | 55 +- >> .../nvkm/subdev/gsp/rm/r535/nvrm/vmm.h | 56 + >> .../ad102.c => subdev/gsp/rm/r535/ofa.c} | 34 +- >> .../drm/nouveau/nvkm/subdev/gsp/rm/r535/rm.c | 69 + >> .../drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c | 691 +++++++ >> .../subdev/{mmu/r535.c => gsp/rm/r535/vmm.c} | 65 +- >> .../nouveau/nvkm/subdev/gsp/rm/r570/Kbuild | 8 + >> .../nouveau/nvkm/subdev/gsp/rm/r570/disp.c | 280 +++ >> .../nouveau/nvkm/subdev/gsp/rm/r570/fbsr.c | 166 ++ >> .../nouveau/nvkm/subdev/gsp/rm/r570/fifo.c | 234 +++ >> .../drm/nouveau/nvkm/subdev/gsp/rm/r570/gr.c | 88 + >> .../drm/nouveau/nvkm/subdev/gsp/rm/r570/gsp.c | 233 +++ >> .../nvkm/subdev/gsp/rm/r570/nvrm/disp.h | 355 ++++ >> .../nvkm/subdev/gsp/rm/r570/nvrm/engine.h | 318 ++++ >> .../nvkm/subdev/gsp/rm/r570/nvrm/fbsr.h | 19 + >> .../subdev/gsp/rm/r570/nvrm/fifo.h} | 241 ++- >> .../subdev/gsp/rm/r570/nvrm/gr.h} | 68 +- >> .../nvkm/subdev/gsp/rm/r570/nvrm/gsp.h | 634 +++++++ >> .../nvkm/subdev/gsp/rm/r570/nvrm/msgfn.h | 57 + >> .../nvkm/subdev/gsp/rm/r570/nvrm/ofa.h | 17 + >> .../nvkm/subdev/gsp/rm/r570/nvrm/rpcfn.h | 249 +++ >> .../subdev/gsp/rm/r570/ofa.c} | 34 +- >> .../drm/nouveau/nvkm/subdev/gsp/rm/r570/rm.c | 115 ++ >> .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h | 181 ++ >> .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/rpc.h | 18 + >> .../subdev/gsp/rm/tu1xx.c} | 46 +- >> .../gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c | 271 ++- >> .../gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c | 20 +- >> .../drm/nouveau/nvkm/subdev/instmem/Kbuild | 3 +- >> .../drm/nouveau/nvkm/subdev/instmem/base.c | 8 +- >> .../subdev/instmem/gh100.c} | 39 +- >> .../drm/nouveau/nvkm/subdev/instmem/nv40.c | 10 +- >> .../drm/nouveau/nvkm/subdev/instmem/nv50.c | 17 +- >> .../drm/nouveau/nvkm/subdev/instmem/priv.h | 6 + >> .../gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild | 4 +- >> .../gpu/drm/nouveau/nvkm/subdev/mmu/base.c | 1 + >> .../cl2080.h => nvkm/subdev/mmu/gh100.c} | 33 +- >> .../drm/nouveau/nvkm/subdev/mmu/memgf100.c | 2 +- >> .../gpu/drm/nouveau/nvkm/subdev/mmu/memnv04.c | 2 +- >> .../gpu/drm/nouveau/nvkm/subdev/mmu/memnv50.c | 2 +- >> .../gpu/drm/nouveau/nvkm/subdev/mmu/priv.h | 2 + >> .../gpu/drm/nouveau/nvkm/subdev/mmu/tu102.c | 2 +- >> drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 10 +- >> drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 7 + >> .../drm/nouveau/nvkm/subdev/mmu/vmmgh100.c | 323 ++++ >> .../drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 3 + >> .../drm/nouveau/nvkm/subdev/mmu/vmmtu102.c | 2 +- >> .../gpu/drm/nouveau/nvkm/subdev/pci/Kbuild | 1 + >> .../gpu/drm/nouveau/nvkm/subdev/pci/base.c | 10 +- >> drivers/gpu/drm/nouveau/nvkm/subdev/pci/g84.c | 5 +- >> drivers/gpu/drm/nouveau/nvkm/subdev/pci/g92.c | 5 +- >> drivers/gpu/drm/nouveau/nvkm/subdev/pci/g94.c | 5 +- >> .../gpu/drm/nouveau/nvkm/subdev/pci/gf100.c | 5 +- >> .../gpu/drm/nouveau/nvkm/subdev/pci/gf106.c | 5 +- >> .../cl90f1.h => nvkm/subdev/pci/gh100.c} | 36 +- >> .../gpu/drm/nouveau/nvkm/subdev/pci/gk104.c | 5 +- >> .../gpu/drm/nouveau/nvkm/subdev/pci/gp100.c | 4 +- >> .../gpu/drm/nouveau/nvkm/subdev/pci/nv04.c | 25 +- >> .../gpu/drm/nouveau/nvkm/subdev/pci/nv40.c | 25 +- >> .../gpu/drm/nouveau/nvkm/subdev/pci/nv46.c | 4 +- >> .../gpu/drm/nouveau/nvkm/subdev/pci/nv4c.c | 4 +- >> .../gpu/drm/nouveau/nvkm/subdev/pci/priv.h | 11 +- >> .../gpu/drm/nouveau/nvkm/subdev/vfn/r535.c | 11 +- >> .../gpu/drm/nouveau/nvkm/subdev/vfn/uvfn.c | 2 +- >> include/drm/display/drm_dp_helper.h | 5 + >> 326 files changed, 14671 insertions(+), 7654 deletions(-) >> create mode 100644 drivers/gpu/drm/nouveau/dispnv50/coreca7d.c >> create mode 100644 drivers/gpu/drm/nouveau/dispnv50/crcca7d.c >> create mode 100644 drivers/gpu/drm/nouveau/dispnv50/headca7d.c >> create mode 100644 drivers/gpu/drm/nouveau/dispnv50/wndwca7e.c >> create mode 100644 drivers/gpu/drm/nouveau/gv100_fence.c >> create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/clc36f.h >> create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/clc97b.h >> create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/clca7d.h >> create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/clca7e.h >> create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gb100/dev_hshub_base.h >> create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gb10b/dev_fbhub.h >> create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gb202/dev_ce.h >> create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gb202/dev_therm.h >> create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_falcon_v4.h >> create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_fb.h >> create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_fsp_pri.h >> create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_mmu.h >> create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_riscv_pri.h >> create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_therm.h >> create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_xtl_ep_pri.h >> create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/pri_nv_xal_ep.h >> create mode 100644 drivers/gpu/drm/nouveau/include/nvif/chan.h >> create mode 100644 drivers/gpu/drm/nouveau/include/nvif/pushc97b.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/nvjpg.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/ofa.h >> create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/fsp.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0080.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080_notification.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/clc0b5sw.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl90f1.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/shared/msgq/inc/msgq/msgq_priv.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/uproc/os/common/include/libos_init_args.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmgspseq.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_allclasses.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_fbsr_nvoc.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_kernel_channel_nvoc.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_kernel_fifo_nvoc.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_mem_desc_nvoc.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_rpc-structures.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_acpi_data.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_engine_type.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/intr/engine_idx.h >> delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/nvbitmask.h >> create mode 100644 drivers/gpu/drm/nouveau/nvif/chan.c >> create mode 100644 drivers/gpu/drm/nouveau/nvif/chan506f.c >> create mode 100644 drivers/gpu/drm/nouveau/nvif/chan906f.c >> create mode 100644 drivers/gpu/drm/nouveau/nvif/chanc36f.c >> rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/nvidia/inc/kernel/os/nv_memory_type.h => nvkm/engine/ce/gb202.c} (68%) >> delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ce/r535.c >> delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/ad102.c >> rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/nvlimits.h => nvkm/engine/fifo/gb202.c} (67%) >> delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/r535.c >> delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvdec/r535.c >> delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvenc/ga102.c >> delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvenc/r535.c >> delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvjpg/Kbuild >> delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvjpg/ad102.c >> delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvjpg/ga100.c >> delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvjpg/priv.h >> delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvjpg/r535.c >> delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ofa/Kbuild >> delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ofa/ad102.c >> delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ofa/ga100.c >> delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ofa/ga102.c >> delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ofa/priv.h >> delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ofa/r535.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/gb100.c >> rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/nvidia/generated/g_os_nvoc.h => nvkm/subdev/fb/gb202.c} (54%) >> rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/nvidia/generated/g_sdk-structures.h => nvkm/subdev/fb/gh100.c} (53%) >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fsp/Kbuild >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fsp/base.c >> rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/nvidia/generated/g_gpu_nvoc.h => nvkm/subdev/fsp/gb100.c} (64%) >> rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_headers.h => nvkm/subdev/fsp/gb202.c} (50%) >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fsp/gh100.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fsp/priv.h >> rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/sdk-structures.h => nvkm/subdev/gsp/gb100.c} (56%) >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/gb202.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/gh100.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/Kbuild >> rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0000.h => nvkm/subdev/gsp/rm/ad10x.c} (53%) >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/engine.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/engine.h >> rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl84a0.h => nvkm/subdev/gsp/rm/ga100.c} (62%) >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/ga1xx.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gb10x.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gb20x.c >> rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0005.h => nvkm/subdev/gsp/rm/gh100.c} (60%) >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gpu.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gr.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gr.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/nvdec.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/nvenc.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/Kbuild >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/alloc.c >> rename drivers/gpu/drm/nouveau/nvkm/subdev/{bar/r535.c => gsp/rm/r535/bar.c} (82%) >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/ce.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/client.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/ctrl.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/device.c >> rename drivers/gpu/drm/nouveau/nvkm/{engine/disp/r535.c => subdev/gsp/rm/r535/disp.c} (85%) >> rename drivers/gpu/drm/nouveau/nvkm/subdev/{instmem/r535.c => gsp/rm/r535/fbsr.c} (84%) >> rename drivers/gpu/drm/nouveau/nvkm/{engine/fifo/r535.c => subdev/gsp/rm/r535/fifo.c} (71%) >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gr.c >> rename drivers/gpu/drm/nouveau/nvkm/subdev/gsp/{r535.c => rm/r535/gsp.c} (61%) >> rename drivers/gpu/drm/nouveau/nvkm/{engine/nvenc/ad102.c => subdev/gsp/rm/r535/nvdec.c} (68%) >> rename drivers/gpu/drm/nouveau/nvkm/{engine/gr/ad102.c => subdev/gsp/rm/r535/nvenc.c} (68%) >> rename drivers/gpu/drm/nouveau/nvkm/{engine/nvdec/ga100.c => subdev/gsp/rm/r535/nvjpg.c} (68%) >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/alloc.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/bar.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/ce.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/client.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/ctrl.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/device.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/disp.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/engine.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/event.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/fbsr.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/fifo.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/gr.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/gsp.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/msgfn.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/nvdec.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/nvenc.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/nvjpg.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/ofa.h >> rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_global_enums.h => nvkm/subdev/gsp/rm/r535/nvrm/rpcfn.h} (83%) >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/vmm.h >> rename drivers/gpu/drm/nouveau/nvkm/{engine/nvdec/ad102.c => subdev/gsp/rm/r535/ofa.c} (70%) >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rm.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c >> rename drivers/gpu/drm/nouveau/nvkm/subdev/{mmu/r535.c => gsp/rm/r535/vmm.c} (57%) >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/Kbuild >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/disp.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/fbsr.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/fifo.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gr.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gsp.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/disp.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/engine.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/fbsr.h >> rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/alloc/alloc_channel.h => nvkm/subdev/gsp/rm/r570/nvrm/fifo.h} (62%) >> rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h => nvkm/subdev/gsp/rm/r570/nvrm/gr.h} (57%) >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/gsp.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/msgfn.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/ofa.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/rpcfn.h >> rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h => nvkm/subdev/gsp/rm/r570/ofa.c} (60%) >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/rm.c >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rpc.h >> rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h => nvkm/subdev/gsp/rm/tu1xx.c} (54%) >> rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/nvidia/generated/g_chipset_nvoc.h => nvkm/subdev/instmem/gh100.c} (56%) >> rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080.h => nvkm/subdev/mmu/gh100.c} (60%) >> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgh100.c >> rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl90f1.h => nvkm/subdev/pci/gh100.c} (59%) >> >> -- >> 2.49.0 >>
On Wed, 30 Apr 2025 at 09:49, Ben Skeggs <bskeggs at nvidia.com> wrote:> > This series implements support for booting GSP-RM firmware version > 570.144, and adds support for GH100, GB10x, and GB20x GPUs. > > A tree containing this series is available here[1], and a temporary > linux-firmware tree here[2]. Timur will send an official patch to > the linux-firmware tree once this series is closer to being merged.I've dug through this and been running in on/off over the past few weeks, Overall I don't think this makes things much worse, if we had to keep adding fws I suspect this might get painful. Apart from my drm/dp patch at the end, Reviewed-by: Dave Airlie <airlied at redhat.com> Dave.> > The series is broken down as follows: > > Patch 1 is a simple fix to the condition used to wait for RM shutdown. > It's not known to fix any issue, but kept separate in case it needs to > be backported. > > Patches 2-4 bump up the maximum instance counts of various engines to > support those available on r570 / newer HW. > > Patches 5-13 split up the GSP-RM code into modules (roughly) around RM > API boundaries, and move all the r535-specific code and headers under > nvkm/subdev/gsp/rm/r535 to make it easier to contain version-specific > code. > > Patches 14-18 reduce the amount of boilerplate needed to implement > engines and engine objects when running on GSP-RM by adding a common > implementation which can be used for all engine types. > > Patches 19-20 switch to using the hInternal{Client,Device,Subdevice} > objects returned by GSP during init instead of allocating them for > each nvkm client, reducing the number of RPCs needed per FD open, and > removing the need to handle changes in r570. > > Patches 21-44 add a bunch of simple HALs around the RMAPI calls that > change between r535 and r570, and, finally, adds support for 570.144. > > Patches 45-52 add support for GH100 Hopper GPUs > > Patches 53-56 add support for GB10x Blackwell GPUs > > Patches 57-60 add support for GB20x Blackwell GPUs > > More details on the various changes are in the specific commit messages. > > [1] https://gitlab.freedesktop.org/bskeggs/nouveau/-/commits/03.01-gb20x?ref_type=heads > [2] https://gitlab.freedesktop.org/bskeggs/linux-firmware/-/commit/1c457ce8dc792dcb57246b8e097a05d2cc4bce90 > > Signed-off-by: Ben Skeggs <bskeggs at nvidia.com> > > Ben Skeggs (59): > drm/nouveau/gsp: fix rm shutdown wait condition > drm/nouveau/ce: bump max instances to 20 > drm/nouveau/nvenc: bump max instances to 4 > drm/nouveau/ofa: bump max instances to 2 > drm/nouveau/gsp: split rpc handling out on its own > drm/nouveau/gsp: split rm ctrl handling out on its own > drm/nouveau/gsp: split rm alloc handling out on its own > drm/nouveau/gsp: split client handling out on its own > drm/nouveau/gsp: split device handling out on its own > drm/nouveau/gsp: move firmware loading to GPU-specific code > drm/nouveau/gsp: move booter handling to GPU-specific code > drm/nouveau/gsp: move subdev/engine impls to subdev/gsp/rm/r535/ > drm/nouveau/gsp: switch to a simpler GSP-RM header layout > drm/nouveau/gsp: add gpu hal stubs > drm/nouveau/gsp: add display class ids to gpu hal > drm/nouveau/gsp: add usermode class id to gpu hal > drm/nouveau/gsp: add channel class id to gpu hal > drm/nouveau/gsp: add common code for engines/engine objects > drm/nouveau/gsp: ignore client engine object handles > drm/nouveau/gsp: use internal.{client,device,subdevice} where possible > drm/nouveau/gsp: add hal for wpr config info + meta init > drm/nouveau/gsp: add hal for gsp.set_system_info() > drm/nouveau/gsp: add hal for gsp.get_static_info() > drm/nouveau/gsp: add hal for gsp.xlat_mc_engine_idx() > drm/nouveau/gsp: add hal for gsp.drop_send_user_shared_data() > drm/nouveau/gsp: add hal for disp.bl_ctrl() > drm/nouveau/gsp: add hal for disp.dp.set_indexed_link_rates() > drm/nouveau/gsp: add hal for disp.get_static_info() > drm/nouveau/gsp: add hal for disp.chan.set_pushbuf() > drm/nouveau/gsp: add hal for fifo.xlat_rm_engine_type() > drm/nouveau/gsp: add hal for fifo.ectx_size() > drm/nouveau/gsp: add hal for gr.get_ctxbufs_info() > drm/nouveau/gsp: add hal for gsp.set_rmargs() > drm/nouveau/gsp: add hals for fbsr.suspend/resume() > drm/nouveau/gsp: add hal for disp.get_supported() > drm/nouveau/gsp: add hal for disp.get_connect_state() > drm/nouveau/gsp: add hal for disp.get_active() > drm/nouveau/gsp: add hal for disp.dp.get_caps() > drm/nouveau/gsp: add hal for fifo.chan.alloc > drm/nouveau/gsp: add hal for fifo.rsvd_chids > drm/nouveau/gsp: add hal for fifo.rc_triggered() > drm/nouveau/gsp: add hal for disp.chan.dmac_alloc() > drm/nouveau/gsp: add hal for gsp.sr_data_size() > drm/nouveau/gsp: add support for 570.144 > drm/nouveau/pci: add PRI address of config space mirror to > nvkm_pci_func > drm/nouveau/instmem: add hal for set_bar0_window_addr() > drm/nouveau/mmu: bump up the maximum page table depth > drm/nouveau/gsp: fetch level shift and PDE from BAR2 VMM > drm/nouveau/gsp: init VMMs with NV0080_CTRL_DMA_SET_PAGE_DIRECTORY > drm/nouveau/gv100-: switch to volta semaphore methods > drm/nouveau: improve handling of 64-bit BARs > drm/nouveau: add support for GH100 > drm/nouveau: add helper functions for allocating pinned/cpu-mapped bos > drm/nouveau/nv50-: separate CHANNEL_GPFIFO handling out from > CHANNEL_DMA > drm/nouveau/gf100-: track chan progress with non-WFI semaphore release > drm/nouveau: add support for GB10x > drm/nouveau/gsp: add hal for fifo.chan.doorbell_handle > drm/nouveau: add support for GB20x > drm/nouveau/kms: add support for GB20x > > Dave Airlie (1): > drm/dp: add option to disable zero sized address only transactions. > > drivers/gpu/drm/display/drm_dp_helper.c | 39 +- > drivers/gpu/drm/nouveau/Kbuild | 2 + > drivers/gpu/drm/nouveau/dispnv04/crtc.c | 22 +- > drivers/gpu/drm/nouveau/dispnv50/Kbuild | 4 + > drivers/gpu/drm/nouveau/dispnv50/core.c | 1 + > drivers/gpu/drm/nouveau/dispnv50/core.h | 6 + > drivers/gpu/drm/nouveau/dispnv50/core507d.c | 1 + > drivers/gpu/drm/nouveau/dispnv50/corec37d.c | 3 +- > drivers/gpu/drm/nouveau/dispnv50/corec57d.c | 2 + > drivers/gpu/drm/nouveau/dispnv50/coreca7d.c | 139 ++ > drivers/gpu/drm/nouveau/dispnv50/crc.c | 4 + > drivers/gpu/drm/nouveau/dispnv50/crc.h | 1 + > drivers/gpu/drm/nouveau/dispnv50/crcca7d.c | 115 ++ > drivers/gpu/drm/nouveau/dispnv50/curs.c | 1 + > drivers/gpu/drm/nouveau/dispnv50/disp.c | 30 +- > drivers/gpu/drm/nouveau/dispnv50/head.c | 1 + > drivers/gpu/drm/nouveau/dispnv50/head.h | 5 + > drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 2 +- > drivers/gpu/drm/nouveau/dispnv50/headca7d.c | 314 ++++ > drivers/gpu/drm/nouveau/dispnv50/wimm.c | 1 + > drivers/gpu/drm/nouveau/dispnv50/wndw.c | 25 +- > drivers/gpu/drm/nouveau/dispnv50/wndw.h | 3 + > drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 1 + > drivers/gpu/drm/nouveau/dispnv50/wndwca7e.c | 226 +++ > drivers/gpu/drm/nouveau/gv100_fence.c | 110 ++ > .../drm/nouveau/include/nvhw/class/clc36f.h | 52 + > .../drm/nouveau/include/nvhw/class/clc97b.h | 22 + > .../drm/nouveau/include/nvhw/class/clca7d.h | 868 +++++++++ > .../drm/nouveau/include/nvhw/class/clca7e.h | 137 ++ > .../include/nvhw/ref/gb100/dev_hshub_base.h | 28 + > .../include/nvhw/ref/gb10b/dev_fbhub.h | 18 + > .../nouveau/include/nvhw/ref/gb202/dev_ce.h | 12 + > .../include/nvhw/ref/gb202/dev_therm.h | 17 + > .../include/nvhw/ref/gh100/dev_falcon_v4.h | 20 + > .../nouveau/include/nvhw/ref/gh100/dev_fb.h | 15 + > .../include/nvhw/ref/gh100/dev_fsp_pri.h | 28 + > .../nouveau/include/nvhw/ref/gh100/dev_mmu.h | 173 ++ > .../include/nvhw/ref/gh100/dev_riscv_pri.h | 14 + > .../include/nvhw/ref/gh100/dev_therm.h | 17 + > .../include/nvhw/ref/gh100/dev_xtl_ep_pri.h | 10 + > .../include/nvhw/ref/gh100/pri_nv_xal_ep.h | 13 + > drivers/gpu/drm/nouveau/include/nvif/chan.h | 76 + > drivers/gpu/drm/nouveau/include/nvif/cl0080.h | 5 +- > drivers/gpu/drm/nouveau/include/nvif/class.h | 35 + > drivers/gpu/drm/nouveau/include/nvif/object.h | 2 +- > drivers/gpu/drm/nouveau/include/nvif/push.h | 14 +- > .../gpu/drm/nouveau/include/nvif/push906f.h | 1 + > .../gpu/drm/nouveau/include/nvif/pushc97b.h | 18 + > .../drm/nouveau/include/nvkm/core/device.h | 17 +- > .../drm/nouveau/include/nvkm/core/layout.h | 7 +- > .../drm/nouveau/include/nvkm/engine/disp.h | 4 - > .../gpu/drm/nouveau/include/nvkm/engine/gr.h | 1 - > .../drm/nouveau/include/nvkm/engine/nvdec.h | 2 - > .../drm/nouveau/include/nvkm/engine/nvenc.h | 2 - > .../drm/nouveau/include/nvkm/engine/nvjpg.h | 8 - > .../gpu/drm/nouveau/include/nvkm/engine/ofa.h | 9 - > .../gpu/drm/nouveau/include/nvkm/subdev/fb.h | 3 + > .../gpu/drm/nouveau/include/nvkm/subdev/fsp.h | 24 + > .../gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 84 +- > .../drm/nouveau/include/nvkm/subdev/instmem.h | 6 +- > .../gpu/drm/nouveau/include/nvkm/subdev/mmu.h | 11 +- > .../gpu/drm/nouveau/include/nvkm/subdev/pci.h | 1 + > .../common/sdk/nvidia/inc/class/cl0080.h | 43 - > .../nvidia/inc/class/cl2080_notification.h | 62 - > .../common/sdk/nvidia/inc/class/clc0b5sw.h | 34 - > .../nvidia/inc/ctrl/ctrl0073/ctrl0073common.h | 39 - > .../nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h | 166 -- > .../sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h | 335 ---- > .../inc/ctrl/ctrl0073/ctrl0073specific.h | 216 --- > .../nvidia/inc/ctrl/ctrl0073/ctrl0073system.h | 65 - > .../nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h | 48 - > .../nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h | 40 - > .../nvidia/inc/ctrl/ctrl2080/ctrl2080event.h | 41 - > .../sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h | 51 - > .../nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h | 52 - > .../nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h | 100 -- > .../sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h | 41 - > .../inc/ctrl/ctrl2080/ctrl2080internal.h | 162 -- > .../common/sdk/nvidia/inc/ctrl/ctrl90f1.h | 95 - > .../nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h | 42 - > .../535.113.01/common/sdk/nvidia/inc/nvos.h | 148 -- > .../common/shared/msgq/inc/msgq/msgq_priv.h | 97 - > .../uproc/os/common/include/libos_init_args.h | 52 - > .../nvalloc/common/inc/gsp/gsp_fw_sr_meta.h | 79 - > .../nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h | 170 -- > .../arch/nvalloc/common/inc/rmRiscvUcode.h | 82 - > .../nvidia/arch/nvalloc/common/inc/rmgspseq.h | 100 -- > .../nvidia/generated/g_allclasses.h | 33 - > .../535.113.01/nvidia/generated/g_fbsr_nvoc.h | 31 - > .../nvidia/generated/g_kernel_channel_nvoc.h | 62 - > .../nvidia/generated/g_kernel_fifo_nvoc.h | 119 -- > .../nvidia/generated/g_mem_desc_nvoc.h | 32 - > .../nvidia/generated/g_rpc-structures.h | 124 -- > .../nvidia/inc/kernel/gpu/gpu_acpi_data.h | 74 - > .../nvidia/inc/kernel/gpu/gpu_engine_type.h | 86 - > .../nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h | 33 - > .../nvidia/inc/kernel/gpu/gsp/gsp_init_args.h | 57 - > .../inc/kernel/gpu/gsp/gsp_static_config.h | 174 -- > .../nvidia/inc/kernel/gpu/intr/engine_idx.h | 57 - > .../nvidia/inc/kernel/gpu/nvbitmask.h | 33 - > .../gpu/drm/nouveau/include/nvrm/nvtypes.h | 2 + > drivers/gpu/drm/nouveau/nouveau_abi16.c | 14 +- > drivers/gpu/drm/nouveau/nouveau_bo.c | 84 +- > drivers/gpu/drm/nouveau/nouveau_bo.h | 7 + > drivers/gpu/drm/nouveau/nouveau_chan.c | 99 +- > drivers/gpu/drm/nouveau/nouveau_chan.h | 16 +- > drivers/gpu/drm/nouveau/nouveau_connector.c | 2 + > drivers/gpu/drm/nouveau/nouveau_dma.c | 103 +- > drivers/gpu/drm/nouveau/nouveau_dma.h | 13 +- > drivers/gpu/drm/nouveau/nouveau_dmem.c | 18 +- > drivers/gpu/drm/nouveau/nouveau_drm.c | 7 +- > drivers/gpu/drm/nouveau/nouveau_exec.c | 12 +- > drivers/gpu/drm/nouveau/nouveau_fence.h | 1 + > drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +- > drivers/gpu/drm/nouveau/nouveau_ttm.c | 12 +- > drivers/gpu/drm/nouveau/nv10_fence.c | 6 +- > drivers/gpu/drm/nouveau/nv17_fence.c | 15 +- > drivers/gpu/drm/nouveau/nv50_fence.c | 15 +- > drivers/gpu/drm/nouveau/nv84_fence.c | 19 +- > drivers/gpu/drm/nouveau/nvif/Kbuild | 6 + > drivers/gpu/drm/nouveau/nvif/chan.c | 173 ++ > drivers/gpu/drm/nouveau/nvif/chan506f.c | 89 + > drivers/gpu/drm/nouveau/nvif/chan906f.c | 110 ++ > drivers/gpu/drm/nouveau/nvif/chanc36f.c | 94 + > drivers/gpu/drm/nouveau/nvif/disp.c | 1 + > drivers/gpu/drm/nouveau/nvif/user.c | 8 +- > drivers/gpu/drm/nouveau/nvkm/engine/Kbuild | 2 - > drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild | 3 +- > .../gpu/drm/nouveau/nvkm/engine/ce/ga100.c | 2 +- > .../gpu/drm/nouveau/nvkm/engine/ce/ga102.c | 2 +- > .../engine/ce/gb202.c} | 22 +- > drivers/gpu/drm/nouveau/nvkm/engine/ce/priv.h | 2 + > drivers/gpu/drm/nouveau/nvkm/engine/ce/r535.c | 108 -- > .../gpu/drm/nouveau/nvkm/engine/ce/tu102.c | 2 +- > .../gpu/drm/nouveau/nvkm/engine/device/base.c | 189 +- > .../gpu/drm/nouveau/nvkm/engine/device/pci.c | 32 +- > .../gpu/drm/nouveau/nvkm/engine/device/priv.h | 3 +- > .../drm/nouveau/nvkm/engine/device/tegra.c | 18 +- > .../gpu/drm/nouveau/nvkm/engine/device/user.c | 9 +- > .../gpu/drm/nouveau/nvkm/engine/disp/Kbuild | 3 - > .../gpu/drm/nouveau/nvkm/engine/disp/ad102.c | 52 - > .../gpu/drm/nouveau/nvkm/engine/disp/chan.c | 2 +- > .../gpu/drm/nouveau/nvkm/engine/disp/gv100.c | 2 +- > .../gpu/drm/nouveau/nvkm/engine/disp/outp.c | 2 +- > .../gpu/drm/nouveau/nvkm/engine/disp/uconn.c | 4 +- > .../gpu/drm/nouveau/nvkm/engine/fifo/Kbuild | 3 +- > .../gpu/drm/nouveau/nvkm/engine/fifo/base.c | 2 +- > .../gpu/drm/nouveau/nvkm/engine/fifo/chan.c | 6 +- > .../gpu/drm/nouveau/nvkm/engine/fifo/chan.h | 2 +- > .../nvlimits.h => nvkm/engine/fifo/gb202.c} | 24 +- > .../gpu/drm/nouveau/nvkm/engine/fifo/gf100.c | 2 +- > .../gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 4 +- > .../gpu/drm/nouveau/nvkm/engine/fifo/gv100.c | 1 - > .../gpu/drm/nouveau/nvkm/engine/fifo/nv04.c | 2 +- > .../gpu/drm/nouveau/nvkm/engine/fifo/nv40.c | 2 +- > .../gpu/drm/nouveau/nvkm/engine/fifo/nv50.c | 2 +- > .../gpu/drm/nouveau/nvkm/engine/fifo/priv.h | 4 + > .../gpu/drm/nouveau/nvkm/engine/fifo/tu102.c | 2 +- > .../gpu/drm/nouveau/nvkm/engine/fifo/uchan.c | 2 +- > drivers/gpu/drm/nouveau/nvkm/engine/gr/Kbuild | 3 - > .../gpu/drm/nouveau/nvkm/engine/gr/ga102.c | 2 +- > .../gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 2 - > drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c | 2 +- > drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c | 2 +- > drivers/gpu/drm/nouveau/nvkm/engine/gr/r535.c | 508 ------ > .../gpu/drm/nouveau/nvkm/engine/gr/tu102.c | 2 +- > .../gpu/drm/nouveau/nvkm/engine/nvdec/Kbuild | 4 - > .../gpu/drm/nouveau/nvkm/engine/nvdec/ga102.c | 12 +- > .../gpu/drm/nouveau/nvkm/engine/nvdec/priv.h | 3 - > .../gpu/drm/nouveau/nvkm/engine/nvdec/r535.c | 110 -- > .../gpu/drm/nouveau/nvkm/engine/nvdec/tu102.c | 12 +- > .../gpu/drm/nouveau/nvkm/engine/nvenc/Kbuild | 4 - > .../gpu/drm/nouveau/nvkm/engine/nvenc/ga102.c | 44 - > .../gpu/drm/nouveau/nvkm/engine/nvenc/priv.h | 3 - > .../gpu/drm/nouveau/nvkm/engine/nvenc/r535.c | 110 -- > .../gpu/drm/nouveau/nvkm/engine/nvenc/tu102.c | 12 +- > .../gpu/drm/nouveau/nvkm/engine/nvjpg/Kbuild | 5 - > .../gpu/drm/nouveau/nvkm/engine/nvjpg/ad102.c | 44 - > .../gpu/drm/nouveau/nvkm/engine/nvjpg/ga100.c | 44 - > .../gpu/drm/nouveau/nvkm/engine/nvjpg/priv.h | 8 - > .../gpu/drm/nouveau/nvkm/engine/nvjpg/r535.c | 107 -- > .../gpu/drm/nouveau/nvkm/engine/ofa/Kbuild | 6 - > .../gpu/drm/nouveau/nvkm/engine/ofa/ad102.c | 44 - > .../gpu/drm/nouveau/nvkm/engine/ofa/ga100.c | 44 - > .../gpu/drm/nouveau/nvkm/engine/ofa/ga102.c | 44 - > .../gpu/drm/nouveau/nvkm/engine/ofa/priv.h | 8 - > .../gpu/drm/nouveau/nvkm/engine/ofa/r535.c | 107 -- > drivers/gpu/drm/nouveau/nvkm/subdev/Kbuild | 1 + > .../gpu/drm/nouveau/nvkm/subdev/bar/Kbuild | 2 - > .../gpu/drm/nouveau/nvkm/subdev/bar/gf100.c | 14 +- > .../gpu/drm/nouveau/nvkm/subdev/bar/nv50.c | 4 +- > .../drm/nouveau/nvkm/subdev/devinit/fbmem.h | 4 +- > .../gpu/drm/nouveau/nvkm/subdev/fault/user.c | 2 +- > drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | 3 + > .../gpu/drm/nouveau/nvkm/subdev/fb/ga102.c | 2 +- > .../gpu/drm/nouveau/nvkm/subdev/fb/gb100.c | 51 + > .../g_os_nvoc.h => nvkm/subdev/fb/gb202.c} | 45 +- > .../subdev/fb/gh100.c} | 46 +- > drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | 2 + > .../gpu/drm/nouveau/nvkm/subdev/fsp/Kbuild | 8 + > .../gpu/drm/nouveau/nvkm/subdev/fsp/base.c | 83 + > .../g_gpu_nvoc.h => nvkm/subdev/fsp/gb100.c} | 34 +- > .../rpc_headers.h => nvkm/subdev/fsp/gb202.c} | 63 +- > .../gpu/drm/nouveau/nvkm/subdev/fsp/gh100.c | 292 +++ > .../gpu/drm/nouveau/nvkm/subdev/fsp/priv.h | 29 + > .../gpu/drm/nouveau/nvkm/subdev/gsp/Kbuild | 5 +- > .../gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c | 27 +- > .../gpu/drm/nouveau/nvkm/subdev/gsp/base.c | 42 +- > .../gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c | 17 +- > .../gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c | 27 +- > .../subdev/gsp/gb100.c} | 48 +- > .../gpu/drm/nouveau/nvkm/subdev/gsp/gb202.c | 55 + > .../gpu/drm/nouveau/nvkm/subdev/gsp/gh100.c | 381 ++++ > .../gpu/drm/nouveau/nvkm/subdev/gsp/priv.h | 41 +- > .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/Kbuild | 18 + > .../cl0000.h => nvkm/subdev/gsp/rm/ad10x.c} | 50 +- > .../drm/nouveau/nvkm/subdev/gsp/rm/engine.c | 206 +++ > .../drm/nouveau/nvkm/subdev/gsp/rm/engine.h | 20 + > .../cl84a0.h => nvkm/subdev/gsp/rm/ga100.c} | 34 +- > .../drm/nouveau/nvkm/subdev/gsp/rm/ga1xx.c | 56 + > .../drm/nouveau/nvkm/subdev/gsp/rm/gb10x.c | 47 + > .../drm/nouveau/nvkm/subdev/gsp/rm/gb20x.c | 61 + > .../cl0005.h => nvkm/subdev/gsp/rm/gh100.c} | 41 +- > .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/gpu.h | 70 + > .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/gr.c | 73 + > .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/gr.h | 42 + > .../drm/nouveau/nvkm/subdev/gsp/rm/nvdec.c | 50 + > .../drm/nouveau/nvkm/subdev/gsp/rm/nvenc.c | 50 + > .../nouveau/nvkm/subdev/gsp/rm/r535/Kbuild | 25 + > .../nouveau/nvkm/subdev/gsp/rm/r535/alloc.c | 112 ++ > .../subdev/{bar/r535.c => gsp/rm/r535/bar.c} | 41 +- > .../drm/nouveau/nvkm/subdev/gsp/rm/r535/ce.c | 46 + > .../nouveau/nvkm/subdev/gsp/rm/r535/client.c | 79 + > .../nouveau/nvkm/subdev/gsp/rm/r535/ctrl.c | 93 + > .../nouveau/nvkm/subdev/gsp/rm/r535/device.c | 148 ++ > .../disp/r535.c => subdev/gsp/rm/r535/disp.c} | 409 +++-- > .../{instmem/r535.c => gsp/rm/r535/fbsr.c} | 58 +- > .../fifo/r535.c => subdev/gsp/rm/r535/fifo.c} | 308 ++-- > .../drm/nouveau/nvkm/subdev/gsp/rm/r535/gr.c | 372 ++++ > .../nvkm/subdev/gsp/{r535.c => rm/r535/gsp.c} | 1586 ++--------------- > .../ad102.c => subdev/gsp/rm/r535/nvdec.c} | 35 +- > .../gr/ad102.c => subdev/gsp/rm/r535/nvenc.c} | 37 +- > .../ga100.c => subdev/gsp/rm/r535/nvjpg.c} | 35 +- > .../nvkm/subdev/gsp/rm/r535/nvrm/alloc.h | 36 + > .../nvkm/subdev/gsp/rm/r535/nvrm/bar.h | 29 + > .../nouveau/nvkm/subdev/gsp/rm/r535/nvrm/ce.h | 15 + > .../nvkm/subdev/gsp/rm/r535/nvrm/client.h | 20 + > .../nvkm/subdev/gsp/rm/r535/nvrm/ctrl.h | 21 + > .../nvkm/subdev/gsp/rm/r535/nvrm/device.h | 30 + > .../nvkm/subdev/gsp/rm/r535/nvrm/disp.h | 741 ++++++++ > .../nvkm/subdev/gsp/rm/r535/nvrm/engine.h | 260 +++ > .../nvkm/subdev/gsp/rm/r535/nvrm/event.h | 47 + > .../nvkm/subdev/gsp/rm/r535/nvrm/fbsr.h | 106 ++ > .../nvkm/subdev/gsp/rm/r535/nvrm/fifo.h | 350 ++++ > .../nouveau/nvkm/subdev/gsp/rm/r535/nvrm/gr.h | 73 + > .../nvkm/subdev/gsp/rm/r535/nvrm/gsp.h | 825 +++++++++ > .../nvkm/subdev/gsp/rm/r535/nvrm/msgfn.h | 53 + > .../nvkm/subdev/gsp/rm/r535/nvrm/nvdec.h | 17 + > .../nvkm/subdev/gsp/rm/r535/nvrm/nvenc.h | 17 + > .../nvkm/subdev/gsp/rm/r535/nvrm/nvjpg.h | 17 + > .../nvkm/subdev/gsp/rm/r535/nvrm/ofa.h | 16 + > .../subdev/gsp/rm/r535/nvrm/rpcfn.h} | 55 +- > .../nvkm/subdev/gsp/rm/r535/nvrm/vmm.h | 56 + > .../ad102.c => subdev/gsp/rm/r535/ofa.c} | 34 +- > .../drm/nouveau/nvkm/subdev/gsp/rm/r535/rm.c | 69 + > .../drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c | 691 +++++++ > .../subdev/{mmu/r535.c => gsp/rm/r535/vmm.c} | 65 +- > .../nouveau/nvkm/subdev/gsp/rm/r570/Kbuild | 8 + > .../nouveau/nvkm/subdev/gsp/rm/r570/disp.c | 280 +++ > .../nouveau/nvkm/subdev/gsp/rm/r570/fbsr.c | 166 ++ > .../nouveau/nvkm/subdev/gsp/rm/r570/fifo.c | 234 +++ > .../drm/nouveau/nvkm/subdev/gsp/rm/r570/gr.c | 88 + > .../drm/nouveau/nvkm/subdev/gsp/rm/r570/gsp.c | 233 +++ > .../nvkm/subdev/gsp/rm/r570/nvrm/disp.h | 355 ++++ > .../nvkm/subdev/gsp/rm/r570/nvrm/engine.h | 318 ++++ > .../nvkm/subdev/gsp/rm/r570/nvrm/fbsr.h | 19 + > .../subdev/gsp/rm/r570/nvrm/fifo.h} | 241 ++- > .../subdev/gsp/rm/r570/nvrm/gr.h} | 68 +- > .../nvkm/subdev/gsp/rm/r570/nvrm/gsp.h | 634 +++++++ > .../nvkm/subdev/gsp/rm/r570/nvrm/msgfn.h | 57 + > .../nvkm/subdev/gsp/rm/r570/nvrm/ofa.h | 17 + > .../nvkm/subdev/gsp/rm/r570/nvrm/rpcfn.h | 249 +++ > .../subdev/gsp/rm/r570/ofa.c} | 34 +- > .../drm/nouveau/nvkm/subdev/gsp/rm/r570/rm.c | 115 ++ > .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h | 181 ++ > .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/rpc.h | 18 + > .../subdev/gsp/rm/tu1xx.c} | 46 +- > .../gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c | 271 ++- > .../gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c | 20 +- > .../drm/nouveau/nvkm/subdev/instmem/Kbuild | 3 +- > .../drm/nouveau/nvkm/subdev/instmem/base.c | 8 +- > .../subdev/instmem/gh100.c} | 39 +- > .../drm/nouveau/nvkm/subdev/instmem/nv40.c | 10 +- > .../drm/nouveau/nvkm/subdev/instmem/nv50.c | 17 +- > .../drm/nouveau/nvkm/subdev/instmem/priv.h | 6 + > .../gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild | 4 +- > .../gpu/drm/nouveau/nvkm/subdev/mmu/base.c | 1 + > .../cl2080.h => nvkm/subdev/mmu/gh100.c} | 33 +- > .../drm/nouveau/nvkm/subdev/mmu/memgf100.c | 2 +- > .../gpu/drm/nouveau/nvkm/subdev/mmu/memnv04.c | 2 +- > .../gpu/drm/nouveau/nvkm/subdev/mmu/memnv50.c | 2 +- > .../gpu/drm/nouveau/nvkm/subdev/mmu/priv.h | 2 + > .../gpu/drm/nouveau/nvkm/subdev/mmu/tu102.c | 2 +- > drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 10 +- > drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 7 + > .../drm/nouveau/nvkm/subdev/mmu/vmmgh100.c | 323 ++++ > .../drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 3 + > .../drm/nouveau/nvkm/subdev/mmu/vmmtu102.c | 2 +- > .../gpu/drm/nouveau/nvkm/subdev/pci/Kbuild | 1 + > .../gpu/drm/nouveau/nvkm/subdev/pci/base.c | 10 +- > drivers/gpu/drm/nouveau/nvkm/subdev/pci/g84.c | 5 +- > drivers/gpu/drm/nouveau/nvkm/subdev/pci/g92.c | 5 +- > drivers/gpu/drm/nouveau/nvkm/subdev/pci/g94.c | 5 +- > .../gpu/drm/nouveau/nvkm/subdev/pci/gf100.c | 5 +- > .../gpu/drm/nouveau/nvkm/subdev/pci/gf106.c | 5 +- > .../cl90f1.h => nvkm/subdev/pci/gh100.c} | 36 +- > .../gpu/drm/nouveau/nvkm/subdev/pci/gk104.c | 5 +- > .../gpu/drm/nouveau/nvkm/subdev/pci/gp100.c | 4 +- > .../gpu/drm/nouveau/nvkm/subdev/pci/nv04.c | 25 +- > .../gpu/drm/nouveau/nvkm/subdev/pci/nv40.c | 25 +- > .../gpu/drm/nouveau/nvkm/subdev/pci/nv46.c | 4 +- > .../gpu/drm/nouveau/nvkm/subdev/pci/nv4c.c | 4 +- > .../gpu/drm/nouveau/nvkm/subdev/pci/priv.h | 11 +- > .../gpu/drm/nouveau/nvkm/subdev/vfn/r535.c | 11 +- > .../gpu/drm/nouveau/nvkm/subdev/vfn/uvfn.c | 2 +- > include/drm/display/drm_dp_helper.h | 5 + > 326 files changed, 14671 insertions(+), 7654 deletions(-) > create mode 100644 drivers/gpu/drm/nouveau/dispnv50/coreca7d.c > create mode 100644 drivers/gpu/drm/nouveau/dispnv50/crcca7d.c > create mode 100644 drivers/gpu/drm/nouveau/dispnv50/headca7d.c > create mode 100644 drivers/gpu/drm/nouveau/dispnv50/wndwca7e.c > create mode 100644 drivers/gpu/drm/nouveau/gv100_fence.c > create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/clc36f.h > create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/clc97b.h > create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/clca7d.h > create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/clca7e.h > create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gb100/dev_hshub_base.h > create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gb10b/dev_fbhub.h > create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gb202/dev_ce.h > create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gb202/dev_therm.h > create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_falcon_v4.h > create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_fb.h > create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_fsp_pri.h > create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_mmu.h > create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_riscv_pri.h > create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_therm.h > create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_xtl_ep_pri.h > create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/pri_nv_xal_ep.h > create mode 100644 drivers/gpu/drm/nouveau/include/nvif/chan.h > create mode 100644 drivers/gpu/drm/nouveau/include/nvif/pushc97b.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/nvjpg.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/ofa.h > create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/fsp.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0080.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080_notification.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/clc0b5sw.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl90f1.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/shared/msgq/inc/msgq/msgq_priv.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/uproc/os/common/include/libos_init_args.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmgspseq.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_allclasses.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_fbsr_nvoc.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_kernel_channel_nvoc.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_kernel_fifo_nvoc.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_mem_desc_nvoc.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_rpc-structures.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_acpi_data.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_engine_type.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/intr/engine_idx.h > delete mode 100644 drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/nvbitmask.h > create mode 100644 drivers/gpu/drm/nouveau/nvif/chan.c > create mode 100644 drivers/gpu/drm/nouveau/nvif/chan506f.c > create mode 100644 drivers/gpu/drm/nouveau/nvif/chan906f.c > create mode 100644 drivers/gpu/drm/nouveau/nvif/chanc36f.c > rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/nvidia/inc/kernel/os/nv_memory_type.h => nvkm/engine/ce/gb202.c} (68%) > delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ce/r535.c > delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/ad102.c > rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/nvlimits.h => nvkm/engine/fifo/gb202.c} (67%) > delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/r535.c > delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvdec/r535.c > delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvenc/ga102.c > delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvenc/r535.c > delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvjpg/Kbuild > delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvjpg/ad102.c > delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvjpg/ga100.c > delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvjpg/priv.h > delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvjpg/r535.c > delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ofa/Kbuild > delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ofa/ad102.c > delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ofa/ga100.c > delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ofa/ga102.c > delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ofa/priv.h > delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ofa/r535.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/gb100.c > rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/nvidia/generated/g_os_nvoc.h => nvkm/subdev/fb/gb202.c} (54%) > rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/nvidia/generated/g_sdk-structures.h => nvkm/subdev/fb/gh100.c} (53%) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fsp/Kbuild > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fsp/base.c > rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/nvidia/generated/g_gpu_nvoc.h => nvkm/subdev/fsp/gb100.c} (64%) > rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_headers.h => nvkm/subdev/fsp/gb202.c} (50%) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fsp/gh100.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fsp/priv.h > rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/sdk-structures.h => nvkm/subdev/gsp/gb100.c} (56%) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/gb202.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/gh100.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/Kbuild > rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0000.h => nvkm/subdev/gsp/rm/ad10x.c} (53%) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/engine.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/engine.h > rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl84a0.h => nvkm/subdev/gsp/rm/ga100.c} (62%) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/ga1xx.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gb10x.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gb20x.c > rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0005.h => nvkm/subdev/gsp/rm/gh100.c} (60%) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gpu.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gr.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gr.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/nvdec.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/nvenc.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/Kbuild > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/alloc.c > rename drivers/gpu/drm/nouveau/nvkm/subdev/{bar/r535.c => gsp/rm/r535/bar.c} (82%) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/ce.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/client.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/ctrl.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/device.c > rename drivers/gpu/drm/nouveau/nvkm/{engine/disp/r535.c => subdev/gsp/rm/r535/disp.c} (85%) > rename drivers/gpu/drm/nouveau/nvkm/subdev/{instmem/r535.c => gsp/rm/r535/fbsr.c} (84%) > rename drivers/gpu/drm/nouveau/nvkm/{engine/fifo/r535.c => subdev/gsp/rm/r535/fifo.c} (71%) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gr.c > rename drivers/gpu/drm/nouveau/nvkm/subdev/gsp/{r535.c => rm/r535/gsp.c} (61%) > rename drivers/gpu/drm/nouveau/nvkm/{engine/nvenc/ad102.c => subdev/gsp/rm/r535/nvdec.c} (68%) > rename drivers/gpu/drm/nouveau/nvkm/{engine/gr/ad102.c => subdev/gsp/rm/r535/nvenc.c} (68%) > rename drivers/gpu/drm/nouveau/nvkm/{engine/nvdec/ga100.c => subdev/gsp/rm/r535/nvjpg.c} (68%) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/alloc.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/bar.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/ce.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/client.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/ctrl.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/device.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/disp.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/engine.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/event.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/fbsr.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/fifo.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/gr.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/gsp.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/msgfn.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/nvdec.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/nvenc.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/nvjpg.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/ofa.h > rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_global_enums.h => nvkm/subdev/gsp/rm/r535/nvrm/rpcfn.h} (83%) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/vmm.h > rename drivers/gpu/drm/nouveau/nvkm/{engine/nvdec/ad102.c => subdev/gsp/rm/r535/ofa.c} (70%) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rm.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c > rename drivers/gpu/drm/nouveau/nvkm/subdev/{mmu/r535.c => gsp/rm/r535/vmm.c} (57%) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/Kbuild > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/disp.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/fbsr.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/fifo.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gr.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gsp.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/disp.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/engine.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/fbsr.h > rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/alloc/alloc_channel.h => nvkm/subdev/gsp/rm/r570/nvrm/fifo.h} (62%) > rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h => nvkm/subdev/gsp/rm/r570/nvrm/gr.h} (57%) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/gsp.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/msgfn.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/ofa.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/rpcfn.h > rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h => nvkm/subdev/gsp/rm/r570/ofa.c} (60%) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/rm.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rpc.h > rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h => nvkm/subdev/gsp/rm/tu1xx.c} (54%) > rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/nvidia/generated/g_chipset_nvoc.h => nvkm/subdev/instmem/gh100.c} (56%) > rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080.h => nvkm/subdev/mmu/gh100.c} (60%) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgh100.c > rename drivers/gpu/drm/nouveau/{include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl90f1.h => nvkm/subdev/pci/gh100.c} (59%) > > -- > 2.49.0 >
On Fri, 2025-05-02 at 13:56 +1000, Dave Airlie wrote:> On Wed, 30 Apr 2025 at 09:49, Ben Skeggs <bskeggs at nvidia.com> wrote: > > > > This series implements support for booting GSP-RM firmware version > > 570.144, and adds support for GH100, GB10x, and GB20x GPUs. > > > > A tree containing this series is available here[1], and a temporary > > linux-firmware tree here[2].? Timur will send an official patch to > > the linux-firmware tree once this series is closer to being merged.FYI: https://github.com/NVIDIA/linux-firmware/commits/nvidia-staging/> I've dug through this and been running in on/off over the past few weeks, > > Overall I don't think this makes things much worse, if we had to keep > adding fws I suspect this might get painful.Agreed, but we need r570 in order to support Hopper and Blackwell. r535 just doesn't support those GPUs. The good news is that Nouveau extends support to all GPUs with r570, so distros can replace r535 with r570 completely[1]. In addition, Nova-Core will also use r570, so we won't need to support a newer firmware version until whatever GPU comes after Blackwell. [1] Apparently there's a small Turing bug with r570, and if that can't get fixed in time, then Turing may need to stay on r535.