* [Nouveau] nouveau/gsp: move to latest fw and small fixes @ 2023-10-31 5:18 ` Dave Airlie 0 siblings, 0 replies; 17+ messages in thread From: Dave Airlie @ 2023-10-31 5:18 UTC (permalink / raw) To: dri-devel; +Cc: nouveau This moves Ben's work to the latest GSP stable firmware 535.113.01. We will be stuck on this for a while. There is also a fix for a message signature, and additions of two registry entries, which seem to help recover from crashes. Dave. ^ permalink raw reply [flat|nested] 17+ messages in thread
* nouveau/gsp: move to latest fw and small fixes @ 2023-10-31 5:18 ` Dave Airlie 0 siblings, 0 replies; 17+ messages in thread From: Dave Airlie @ 2023-10-31 5:18 UTC (permalink / raw) To: dri-devel; +Cc: nouveau This moves Ben's work to the latest GSP stable firmware 535.113.01. We will be stuck on this for a while. There is also a fix for a message signature, and additions of two registry entries, which seem to help recover from crashes. Dave. ^ permalink raw reply [flat|nested] 17+ messages in thread
* [Nouveau] [PATCH 1/3] nouveau/gsp: move to 535.113.01 2023-10-31 5:18 ` Dave Airlie @ 2023-10-31 5:18 ` Dave Airlie -1 siblings, 0 replies; 17+ messages in thread From: Dave Airlie @ 2023-10-31 5:18 UTC (permalink / raw) To: dri-devel; +Cc: nouveau From: Dave Airlie <airlied@redhat.com> This moves the initial effort to the latest 535 firmware. The gsp msg structs have changed, and the message passing also. The wpr also seems to have some struct changes. This version of the firmware will be what we are stuck on for a while, until we can refactor the driver and work out a better path forward. Signed-off-by: Dave Airlie <airlied@redhat.com> --- .../sdk/nvidia/inc/alloc/alloc_channel.h | 13 +++- .../common/sdk/nvidia/inc/class/cl0000.h | 4 +- .../common/sdk/nvidia/inc/class/cl0005.h | 2 +- .../common/sdk/nvidia/inc/class/cl0080.h | 2 +- .../common/sdk/nvidia/inc/class/cl2080.h | 2 +- .../nvidia/inc/class/cl2080_notification.h | 2 +- .../common/sdk/nvidia/inc/class/cl84a0.h | 2 +- .../common/sdk/nvidia/inc/class/cl90f1.h | 2 +- .../common/sdk/nvidia/inc/class/clc0b5sw.h | 2 +- .../nvidia/inc/ctrl/ctrl0073/ctrl0073common.h | 2 +- .../nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h | 2 +- .../sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h | 4 +- .../inc/ctrl/ctrl0073/ctrl0073specific.h | 2 +- .../nvidia/inc/ctrl/ctrl0073/ctrl0073system.h | 2 +- .../nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h | 2 +- .../nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h | 2 +- .../sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h | 2 +- .../nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h | 2 +- .../sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h | 2 +- .../nvidia/inc/ctrl/ctrl2080/ctrl2080event.h | 2 +- .../sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h | 2 +- .../nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h | 2 +- .../nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h | 2 +- .../sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h | 2 +- .../inc/ctrl/ctrl2080/ctrl2080internal.h | 2 +- .../common/sdk/nvidia/inc/ctrl/ctrl90f1.h | 2 +- .../nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h | 2 +- .../common/sdk/nvidia/inc/nvlimits.h | 2 +- .../common/sdk/nvidia/inc/nvos.h | 2 +- .../common/shared/msgq/inc/msgq/msgq_priv.h | 2 +- .../uproc/os/common/include/libos_init_args.h | 2 +- .../nvalloc/common/inc/gsp/gsp_fw_sr_meta.h | 2 +- .../nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h | 47 ++++++++---- .../arch/nvalloc/common/inc/rmRiscvUcode.h | 2 +- .../nvidia/arch/nvalloc/common/inc/rmgspseq.h | 2 +- .../nvidia/generated/g_allclasses.h | 2 +- .../nvidia/generated/g_chipset_nvoc.h | 2 +- .../nvidia/generated/g_fbsr_nvoc.h | 2 +- .../nvidia/generated/g_gpu_nvoc.h | 2 +- .../nvidia/generated/g_kernel_channel_nvoc.h | 2 +- .../nvidia/generated/g_kernel_fifo_nvoc.h | 2 +- .../nvidia/generated/g_mem_desc_nvoc.h | 2 +- .../nvidia/generated/g_os_nvoc.h | 2 +- .../nvidia/generated/g_rpc-structures.h | 6 +- .../nvidia/generated/g_sdk-structures.h | 4 +- .../nvidia/inc/kernel/gpu/gpu_acpi_data.h | 4 +- .../nvidia/inc/kernel/gpu/gpu_engine_type.h | 2 +- .../nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h | 2 +- .../nvidia/inc/kernel/gpu/gsp/gsp_init_args.h | 2 +- .../inc/kernel/gpu/gsp/gsp_static_config.h | 26 +++---- .../nvidia/inc/kernel/gpu/intr/engine_idx.h | 2 +- .../nvidia/inc/kernel/gpu/nvbitmask.h | 4 +- .../nvidia/inc/kernel/os/nv_memory_type.h | 2 +- .../nvidia/kernel/inc/vgpu/rpc_global_enums.h | 2 +- .../nvidia/kernel/inc/vgpu/rpc_headers.h | 2 +- .../nvidia/kernel/inc/vgpu/sdk-structures.h | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/ce/r535.c | 4 +- .../gpu/drm/nouveau/nvkm/engine/disp/r535.c | 20 ++--- .../gpu/drm/nouveau/nvkm/engine/fifo/r535.c | 20 ++--- drivers/gpu/drm/nouveau/nvkm/engine/gr/r535.c | 10 +-- .../gpu/drm/nouveau/nvkm/engine/nvdec/r535.c | 2 +- .../gpu/drm/nouveau/nvkm/engine/nvenc/r535.c | 2 +- .../gpu/drm/nouveau/nvkm/engine/nvjpg/r535.c | 2 +- .../gpu/drm/nouveau/nvkm/engine/ofa/r535.c | 2 +- .../gpu/drm/nouveau/nvkm/subdev/bar/r535.c | 6 +- .../gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c | 4 +- .../gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c | 4 +- .../gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c | 4 +- .../gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 76 +++++++++++-------- .../gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c | 4 +- .../gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c | 4 +- .../drm/nouveau/nvkm/subdev/instmem/r535.c | 12 +-- .../gpu/drm/nouveau/nvkm/subdev/mmu/r535.c | 6 +- 73 files changed, 217 insertions(+), 171 deletions(-) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/alloc/alloc_channel.h (93%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/class/cl0000.h (94%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/class/cl0005.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/class/cl0080.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/class/cl2080.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/class/cl2080_notification.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/class/cl84a0.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/class/cl90f1.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/class/clc0b5sw.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl90f1.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/nvlimits.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/nvos.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/shared/msgq/inc/msgq/msgq_priv.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/uproc/os/common/include/libos_init_args.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h (81%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/arch/nvalloc/common/inc/rmgspseq.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_allclasses.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_chipset_nvoc.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_fbsr_nvoc.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_gpu_nvoc.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_kernel_channel_nvoc.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_kernel_fifo_nvoc.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_mem_desc_nvoc.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_os_nvoc.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_rpc-structures.h (95%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_sdk-structures.h (94%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/inc/kernel/gpu/gpu_acpi_data.h (95%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/inc/kernel/gpu/gpu_engine_type.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h (86%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/inc/kernel/gpu/intr/engine_idx.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/inc/kernel/gpu/nvbitmask.h (93%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/inc/kernel/os/nv_memory_type.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/kernel/inc/vgpu/rpc_global_enums.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/kernel/inc/vgpu/rpc_headers.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/kernel/inc/vgpu/sdk-structures.h (97%) diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/alloc/alloc_channel.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/alloc/alloc_channel.h similarity index 93% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/alloc/alloc_channel.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/alloc/alloc_channel.h index 29d0b58c25c3..7157c7757698 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/alloc/alloc_channel.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/alloc/alloc_channel.h @@ -1,8 +1,8 @@ #ifndef __src_common_sdk_nvidia_inc_alloc_alloc_channel_h__ #define __src_common_sdk_nvidia_inc_alloc_alloc_channel_h__ -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvlimits.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvlimits.h> -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. @@ -116,6 +116,9 @@ typedef struct NV_MEMORY_DESC_PARAMS { #define NVOS04_FLAGS_SKIP_CTXBUFFER_ALLOC_FALSE 0x00000000 #define NVOS04_FLAGS_SKIP_CTXBUFFER_ALLOC_TRUE 0x00000001 +#define CC_CHAN_ALLOC_IV_SIZE_DWORD 3U +#define CC_CHAN_ALLOC_NONCE_SIZE_DWORD 8U + typedef struct NV_CHANNEL_ALLOC_PARAMS { NvHandle hObjectError; // error context DMA @@ -154,6 +157,12 @@ typedef struct NV_CHANNEL_ALLOC_PARAMS { NV_DECLARE_ALIGNED(NV_MEMORY_DESC_PARAMS eccErrorNotifierMem, 8); // reserved NvU32 ProcessID; // reserved NvU32 SubProcessID; // reserved + // IV used for CPU-side encryption / GPU-side decryption. + NvU32 encryptIv[CC_CHAN_ALLOC_IV_SIZE_DWORD]; // reserved + // IV used for CPU-side decryption / GPU-side encryption. + NvU32 decryptIv[CC_CHAN_ALLOC_IV_SIZE_DWORD]; // reserved + // Nonce used CPU-side signing / GPU-side signature verification. + NvU32 hmacNonce[CC_CHAN_ALLOC_NONCE_SIZE_DWORD]; // reserved } NV_CHANNEL_ALLOC_PARAMS; typedef NV_CHANNEL_ALLOC_PARAMS NV_CHANNELGPFIFO_ALLOCATION_PARAMETERS; diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0000.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0000.h similarity index 94% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0000.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0000.h index dfb3b3e0c45b..7a3fc023072d 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0000.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0000.h @@ -1,8 +1,8 @@ #ifndef __src_common_sdk_nvidia_inc_class_cl0000_h__ #define __src_common_sdk_nvidia_inc_class_cl0000_h__ -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvlimits.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvlimits.h> -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2001-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0005.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0005.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0005.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0005.h index 987bae11ad91..e4de36d63666 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0005.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0005.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_class_cl0005_h__ #define __src_common_sdk_nvidia_inc_class_cl0005_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2001-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0080.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0080.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0080.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0080.h index aeab857b1e50..8868118e47d6 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0080.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0080.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_class_cl0080_h__ #define __src_common_sdk_nvidia_inc_class_cl0080_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2001-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080.h index a0106cd77cd9..9040ea5608a0 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_class_cl2080_h__ #define __src_common_sdk_nvidia_inc_class_cl2080_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2002-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080_notification.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080_notification.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080_notification.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080_notification.h index eea583de08f3..ba659d6477d3 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080_notification.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080_notification.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_class_cl2080_notification_h__ #define __src_common_sdk_nvidia_inc_class_cl2080_notification_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl84a0.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl84a0.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl84a0.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl84a0.h index d96855d42e62..9eb780a1ac72 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl84a0.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl84a0.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_class_cl84a0_h__ #define __src_common_sdk_nvidia_inc_class_cl84a0_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2001-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl90f1.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl90f1.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl90f1.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl90f1.h index 6ed4ed49bbcc..f1d21776e395 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl90f1.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl90f1.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_class_cl90f1_h__ #define __src_common_sdk_nvidia_inc_class_cl90f1_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2011 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/clc0b5sw.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/clc0b5sw.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/clc0b5sw.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/clc0b5sw.h index 7dcc961cf0dc..b8f32576cfaa 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/clc0b5sw.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/clc0b5sw.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_class_clc0b5sw_h__ #define __src_common_sdk_nvidia_inc_class_clc0b5sw_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2014-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h index 9f2b8557c79c..58b3ba7badf1 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073common_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073common_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h index 193f2cbc302b..596f2ea8344e 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073dfp_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073dfp_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2005-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h index 76dafc828064..bae4b1997736 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h @@ -1,8 +1,8 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073dp_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073dp_h__ -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h> -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2005-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h index bf44b28e7603..954958dcf834 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073specific_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073specific_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 1993-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h index 1ff22f06dc82..d69cef3c01fd 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073system_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073system_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2005-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h index 7fda8d2d2067..6acb3f73242d 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl0080_ctrl0080fifo_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl0080_ctrl0080fifo_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2006-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h index 60ba4967dcd9..3db099e62364 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl0080_ctrl0080gpu_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl0080_ctrl0080gpu_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2004-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h index c08e2fcb4979..ed01df925573 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl0080_ctrl0080gr_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl0080_ctrl0080gr_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2004-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h index 9c61a6f74aa4..b5b7631de99b 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080bios_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080bios_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2005-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h index c1e79f64bd03..fe912d2bd183 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080ce_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080ce_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2014-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h index 472702723057..87bc4ff92ce1 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080event_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080event_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2006-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h index 20a50a22e748..68c81f9f803c 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080fb_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080fb_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2006-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h index 8865dd589822..bc0f63699b06 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080fifo_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080fifo_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2006-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h index ce43708a6f18..29d7a1052142 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080gpu_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080gpu_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2006-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h index 6f99038d6e16..59f8895bc5d7 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080gr_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080gr_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2006-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h index cfe53c7cb4ce..e11b2dbe5288 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080internal_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080internal_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2020-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl90f1.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl90f1.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl90f1.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl90f1.h index fbc2794c0341..977e59818533 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl90f1.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl90f1.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl90f1_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl90f1_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2014-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h index fce434425bdf..684045796232 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrla06f_ctrla06fgpfifo_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrla06f_ctrla06fgpfifo_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2007-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/nvlimits.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/nvlimits.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/nvlimits.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/nvlimits.h index 21f53f46a7b8..5c5a004a8031 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/nvlimits.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/nvlimits.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_nvlimits_h__ #define __src_common_sdk_nvidia_inc_nvlimits_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2017 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h index 7e909d8945cd..51b5591c603e 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_nvos_h__ #define __src_common_sdk_nvidia_inc_nvos_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 1993-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/shared/msgq/inc/msgq/msgq_priv.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/shared/msgq/inc/msgq/msgq_priv.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/shared/msgq/inc/msgq/msgq_priv.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/shared/msgq/inc/msgq/msgq_priv.h index 26b096d0e225..5a2f273d95c8 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/shared/msgq/inc/msgq/msgq_priv.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/shared/msgq/inc/msgq/msgq_priv.h @@ -1,7 +1,7 @@ #ifndef __src_common_shared_msgq_inc_msgq_msgq_priv_h__ #define __src_common_shared_msgq_inc_msgq_msgq_priv_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2018-2019 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/uproc/os/common/include/libos_init_args.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/uproc/os/common/include/libos_init_args.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/uproc/os/common/include/libos_init_args.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/uproc/os/common/include/libos_init_args.h index 0aa4b26fda09..83cf1b2c15a3 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/uproc/os/common/include/libos_init_args.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/uproc/os/common/include/libos_init_args.h @@ -1,7 +1,7 @@ #ifndef __src_common_uproc_os_common_include_libos_init_args_h__ #define __src_common_uproc_os_common_include_libos_init_args_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2018-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h index e3754a3bfe39..73213bdfcbda 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_arch_nvalloc_common_inc_gsp_gsp_fw_sr_meta_h__ #define __src_nvidia_arch_nvalloc_common_inc_gsp_gsp_fw_sr_meta_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2022-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h similarity index 81% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h index 65efe8985a72..a2e141e4b459 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_arch_nvalloc_common_inc_gsp_gsp_fw_wpr_meta_h__ #define __src_nvidia_arch_nvalloc_common_inc_gsp_gsp_fw_wpr_meta_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2021-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. @@ -115,21 +115,42 @@ typedef struct // be moved to a different comm. mechanism between the bootstrapper // and the GSP-RM tasks. - // Shared partition RPC memory (physical address) - NvU64 partitionRpcAddr; + union + { + struct + { + // Shared partition RPC memory (physical address) + NvU64 partitionRpcAddr; + + // Offsets relative to partitionRpcAddr + NvU16 partitionRpcRequestOffset; + NvU16 partitionRpcReplyOffset; - // Offsets relative to partitionRpcAddr - NvU16 partitionRpcRequestOffset; - NvU16 partitionRpcReplyOffset; + // Code section and dataSection offset and size. + NvU32 elfCodeOffset; + NvU32 elfDataOffset; + NvU32 elfCodeSize; + NvU32 elfDataSize; - // Code section and dataSection offset and size. - NvU32 elfCodeOffset; - NvU32 elfDataOffset; - NvU32 elfCodeSize; - NvU32 elfDataSize; + // Used during GSP-RM resume to check for revocation + NvU32 lsUcodeVersion; + }; - // Used during GSP-RM resume to check for revocation - NvU32 lsUcodeVersion; + struct + { + // Pad for the partitionRpc* fields, plus 4 bytes + NvU32 partitionRpcPadding[4]; + + // CrashCat (contiguous) buffer size/location - occupies same bytes as the + // elf(Code|Data)(Offset|Size) fields above. + // TODO: move to GSP_FMC_INIT_PARAMS + NvU64 sysmemAddrOfCrashReportQueue; + NvU32 sizeOfCrashReportQueue; + + // Pad for the lsUcodeVersion field + NvU32 lsUcodeVersionPadding[1]; + }; + }; // Number of VF partitions allocating sub-heaps from the WPR heap // Used during boot to ensure the heap is adequately sized diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h index da18e7eab940..4eff473e8990 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_arch_nvalloc_common_inc_rmRiscvUcode_h__ #define __src_nvidia_arch_nvalloc_common_inc_rmRiscvUcode_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2018-2019 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/rmgspseq.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmgspseq.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/rmgspseq.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmgspseq.h index 1048205a0e46..341ab0dbeaf2 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/rmgspseq.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmgspseq.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_arch_nvalloc_common_inc_rmgspseq_h__ #define __src_nvidia_arch_nvalloc_common_inc_rmgspseq_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2019-2020 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_allclasses.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_allclasses.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_allclasses.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_allclasses.h index b17520135233..3144e9beac61 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_allclasses.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_allclasses.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_generated_g_allclasses_h__ #define __src_nvidia_generated_g_allclasses_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2021-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_chipset_nvoc.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_chipset_nvoc.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_chipset_nvoc.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_chipset_nvoc.h index 94e79e14cba7..6b8921138c7d 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_chipset_nvoc.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_chipset_nvoc.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_generated_g_chipset_nvoc_h__ #define __src_nvidia_generated_g_chipset_nvoc_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 1993-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_fbsr_nvoc.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_fbsr_nvoc.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_fbsr_nvoc.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_fbsr_nvoc.h index 00198b7ecd23..a5128f00225b 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_fbsr_nvoc.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_fbsr_nvoc.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_generated_g_fbsr_nvoc_h__ #define __src_nvidia_generated_g_fbsr_nvoc_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2009-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_gpu_nvoc.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_gpu_nvoc.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_gpu_nvoc.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_gpu_nvoc.h index 7194a8f02909..5641a21cacca 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_gpu_nvoc.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_gpu_nvoc.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_generated_g_gpu_nvoc_h__ #define __src_nvidia_generated_g_gpu_nvoc_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2004-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_kernel_channel_nvoc.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_kernel_channel_nvoc.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_kernel_channel_nvoc.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_kernel_channel_nvoc.h index c87503317d8f..b5ad55f854dc 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_kernel_channel_nvoc.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_kernel_channel_nvoc.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_generated_g_kernel_channel_nvoc_h__ #define __src_nvidia_generated_g_kernel_channel_nvoc_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2020-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_kernel_fifo_nvoc.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_kernel_fifo_nvoc.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_kernel_fifo_nvoc.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_kernel_fifo_nvoc.h index dd706d126ce6..946954ac5b3d 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_kernel_fifo_nvoc.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_kernel_fifo_nvoc.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_generated_g_kernel_fifo_nvoc_h__ #define __src_nvidia_generated_g_kernel_fifo_nvoc_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2021-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_mem_desc_nvoc.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_mem_desc_nvoc.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_mem_desc_nvoc.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_mem_desc_nvoc.h index dff4bd362772..daabaee41c87 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_mem_desc_nvoc.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_mem_desc_nvoc.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_generated_g_mem_desc_nvoc_h__ #define __src_nvidia_generated_g_mem_desc_nvoc_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 1993-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_os_nvoc.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_os_nvoc.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_os_nvoc.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_os_nvoc.h index 639adbd99545..754c6af42f30 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_os_nvoc.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_os_nvoc.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_generated_g_os_nvoc_h__ #define __src_nvidia_generated_g_os_nvoc_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 1993-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_rpc-structures.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_rpc-structures.h similarity index 95% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_rpc-structures.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_rpc-structures.h index a0ca9fff3f07..8d925e24faea 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_rpc-structures.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_rpc-structures.h @@ -1,9 +1,9 @@ #ifndef __src_nvidia_generated_g_rpc_structures_h__ #define __src_nvidia_generated_g_rpc_structures_h__ -#include <nvrm/535.54.03/nvidia/generated/g_sdk-structures.h> -#include <nvrm/535.54.03/nvidia/kernel/inc/vgpu/sdk-structures.h> +#include <nvrm/535.113.01/nvidia/generated/g_sdk-structures.h> +#include <nvrm/535.113.01/nvidia/kernel/inc/vgpu/sdk-structures.h> -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2008-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_sdk-structures.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_sdk-structures.h similarity index 94% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_sdk-structures.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_sdk-structures.h index fe2d9062a4c4..e9fed4140468 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_sdk-structures.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_sdk-structures.h @@ -1,8 +1,8 @@ #ifndef __src_nvidia_generated_g_sdk_structures_h__ #define __src_nvidia_generated_g_sdk_structures_h__ -#include <nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_headers.h> +#include <nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_headers.h> -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2008-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gpu_acpi_data.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_acpi_data.h similarity index 95% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gpu_acpi_data.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_acpi_data.h index 11f822f875d5..af50b11ec3b4 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gpu_acpi_data.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_acpi_data.h @@ -1,8 +1,8 @@ #ifndef __src_nvidia_inc_kernel_gpu_gpu_acpi_data_h__ #define __src_nvidia_inc_kernel_gpu_gpu_acpi_data_h__ -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h> -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gpu_engine_type.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_engine_type.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gpu_engine_type.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_engine_type.h index 90cd9f6c4d9a..e3160c60036d 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gpu_engine_type.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_engine_type.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_inc_kernel_gpu_gpu_engine_type_h__ #define __src_nvidia_inc_kernel_gpu_gpu_engine_type_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2021-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h index 1169ff62160f..3abec59f0cc4 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_inc_kernel_gpu_gsp_gsp_fw_heap_h__ #define __src_nvidia_inc_kernel_gpu_gsp_gsp_fw_heap_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2022-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h index cacd46f3208c..4033a6f85a76 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_inc_kernel_gpu_gsp_gsp_init_args_h__ #define __src_nvidia_inc_kernel_gpu_gsp_gsp_init_args_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2020-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h similarity index 86% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h index 3f99cab47a13..eeab25a5e290 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h @@ -1,18 +1,18 @@ #ifndef __src_nvidia_inc_kernel_gpu_gsp_gsp_static_config_h__ #define __src_nvidia_inc_kernel_gpu_gsp_gsp_static_config_h__ -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h> -#include <nvrm/535.54.03/nvidia/generated/g_chipset_nvoc.h> -#include <nvrm/535.54.03/nvidia/generated/g_gpu_nvoc.h> -#include <nvrm/535.54.03/nvidia/inc/kernel/gpu/gpu_acpi_data.h> -#include <nvrm/535.54.03/nvidia/inc/kernel/gpu/nvbitmask.h> -#include <nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_headers.h> - -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h> +#include <nvrm/535.113.01/nvidia/generated/g_chipset_nvoc.h> +#include <nvrm/535.113.01/nvidia/generated/g_gpu_nvoc.h> +#include <nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_acpi_data.h> +#include <nvrm/535.113.01/nvidia/inc/kernel/gpu/nvbitmask.h> +#include <nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_headers.h> + +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2019-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/intr/engine_idx.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/intr/engine_idx.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/intr/engine_idx.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/intr/engine_idx.h index cca520f61818..bd5e01f9814b 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/intr/engine_idx.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/intr/engine_idx.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_inc_kernel_gpu_intr_engine_idx_h__ #define __src_nvidia_inc_kernel_gpu_intr_engine_idx_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 1993-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/nvbitmask.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/nvbitmask.h similarity index 93% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/nvbitmask.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/nvbitmask.h index 16168294e524..366447a368bf 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/nvbitmask.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/nvbitmask.h @@ -1,8 +1,8 @@ #ifndef __src_nvidia_inc_kernel_gpu_nvbitmask_h__ #define __src_nvidia_inc_kernel_gpu_nvbitmask_h__ -#include <nvrm/535.54.03/nvidia/inc/kernel/gpu/gpu_engine_type.h> +#include <nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_engine_type.h> -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2021-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/os/nv_memory_type.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/os/nv_memory_type.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/os/nv_memory_type.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/os/nv_memory_type.h index c8f046bb630f..4a850dad4776 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/os/nv_memory_type.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/os/nv_memory_type.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_inc_kernel_os_nv_memory_type_h__ #define __src_nvidia_inc_kernel_os_nv_memory_type_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2020 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_global_enums.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_global_enums.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_global_enums.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_global_enums.h index 5b7ffd56084b..73c57f235f6a 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_global_enums.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_global_enums.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_kernel_inc_vgpu_rpc_global_enums_h__ #define __src_nvidia_kernel_inc_vgpu_rpc_global_enums_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ #ifndef X # define X(UNIT, RPC) NV_VGPU_MSG_FUNCTION_##RPC, diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_headers.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_headers.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_headers.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_headers.h index 07143060a9f5..f14b23852456 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_headers.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_headers.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_kernel_inc_vgpu_rpc_headers_h__ #define __src_nvidia_kernel_inc_vgpu_rpc_headers_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2017-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/kernel/inc/vgpu/sdk-structures.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/sdk-structures.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/kernel/inc/vgpu/sdk-structures.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/sdk-structures.h index 2dc692ec9352..7801af232dff 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/kernel/inc/vgpu/sdk-structures.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/sdk-structures.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_kernel_inc_vgpu_sdk_structures_h__ #define __src_nvidia_kernel_inc_vgpu_sdk_structures_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2020-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ce/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/ce/r535.c index 0c6f921d31c3..bd0d435dbbd3 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/ce/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/ce/r535.c @@ -26,8 +26,8 @@ #include <engine/fifo.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080_notification.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/clc0b5sw.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080_notification.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/clc0b5sw.h> struct r535_ce_obj { struct nvkm_object object; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c index 6c54c473bb6d..298035070b3a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c @@ -37,16 +37,16 @@ #include <nvhw/drf.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080_notification.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h> -#include <nvrm/535.54.03/nvidia/generated/g_allclasses.h> -#include <nvrm/535.54.03/nvidia/generated/g_mem_desc_nvoc.h> -#include <nvrm/535.54.03/nvidia/inc/kernel/os/nv_memory_type.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080_notification.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h> +#include <nvrm/535.113.01/nvidia/generated/g_allclasses.h> +#include <nvrm/535.113.01/nvidia/generated/g_mem_desc_nvoc.h> +#include <nvrm/535.113.01/nvidia/inc/kernel/os/nv_memory_type.h> #include <linux/acpi.h> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/r535.c index 14a67cf96204..b374d72fd1c1 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/r535.c @@ -34,16 +34,16 @@ #include <nvhw/drf.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/alloc/alloc_channel.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080_notification.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h> -#include <nvrm/535.54.03/nvidia/generated/g_kernel_channel_nvoc.h> -#include <nvrm/535.54.03/nvidia/generated/g_kernel_fifo_nvoc.h> -#include <nvrm/535.54.03/nvidia/inc/kernel/gpu/gpu_engine_type.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/alloc/alloc_channel.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080_notification.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h> +#include <nvrm/535.113.01/nvidia/generated/g_kernel_channel_nvoc.h> +#include <nvrm/535.113.01/nvidia/generated/g_kernel_fifo_nvoc.h> +#include <nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_engine_type.h> static u32 r535_chan_doorbell_handle(struct nvkm_chan *chan) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/r535.c index a7501b52137c..f4bed3eb1ec2 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/r535.c @@ -31,11 +31,11 @@ #include <nvhw/drf.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/alloc/alloc_channel.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> -#include <nvrm/535.54.03/nvidia/generated/g_kernel_channel_nvoc.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/alloc/alloc_channel.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> +#include <nvrm/535.113.01/nvidia/generated/g_kernel_channel_nvoc.h> #define r535_gr(p) container_of((p), struct r535_gr, base) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/r535.c index fd6c35e01510..75a24f3e6617 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/r535.c @@ -26,7 +26,7 @@ #include <engine/fifo.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h> struct r535_nvdec_obj { struct nvkm_object object; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/r535.c index 8449b41c72db..c8a2a9196ce5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/r535.c @@ -26,7 +26,7 @@ #include <engine/fifo.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h> struct r535_nvenc_obj { struct nvkm_object object; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/nvjpg/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/nvjpg/r535.c index a054bff98f96..1babddc4eb80 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/nvjpg/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/nvjpg/r535.c @@ -26,7 +26,7 @@ #include <engine/fifo.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h> struct r535_nvjpg_obj { struct nvkm_object object; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ofa/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/ofa/r535.c index b34d6d0a6913..438dc692eefe 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/ofa/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/ofa/r535.c @@ -27,7 +27,7 @@ #include <engine/fifo.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h> struct r535_ofa_obj { struct nvkm_object object; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/r535.c index 461fb8daf596..4135690326f4 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/r535.c @@ -28,9 +28,9 @@ #include <subdev/mmu/vmm.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/nvidia/generated/g_rpc-structures.h> -#include <nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_global_enums.h> -#include <nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_headers.h> +#include <nvrm/535.113.01/nvidia/generated/g_rpc-structures.h> +#include <nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_global_enums.h> +#include <nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_headers.h> static void r535_bar_flush(struct nvkm_bar *bar) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c index 0ca6c397de96..c849c6299c52 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c @@ -22,7 +22,7 @@ #include "priv.h" static const struct nvkm_gsp_func -ad102_gsp_r535_54_03 = { +ad102_gsp_r535_113_01 = { .flcn = &ga102_gsp_flcn, .fwsec = &ga102_gsp_fwsec, @@ -45,7 +45,7 @@ ad102_gsp_r535_54_03 = { static struct nvkm_gsp_fwif ad102_gsps[] = { - { 0, r535_gsp_load, &ad102_gsp_r535_54_03, "535.54.03", true }, + { 0, r535_gsp_load, &ad102_gsp_r535_113_01, "535.113.01", true }, {} }; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c index 8a2c7347f64e..223f68b532ef 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c @@ -39,7 +39,7 @@ ga100_gsp_flcn = { }; static const struct nvkm_gsp_func -ga100_gsp_r535_54_03 = { +ga100_gsp_r535_113_01 = { .flcn = &ga100_gsp_flcn, .fwsec = &tu102_gsp_fwsec, @@ -61,7 +61,7 @@ ga100_gsp_r535_54_03 = { static struct nvkm_gsp_fwif ga100_gsps[] = { - { 0, r535_gsp_load, &ga100_gsp_r535_54_03, "535.54.03" }, + { 0, r535_gsp_load, &ga100_gsp_r535_113_01, "535.113.01" }, { -1, gv100_gsp_nofw, &gv100_gsp }, {} }; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c index 1c41e77d607f..4c4b4168a266 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c @@ -150,7 +150,7 @@ ga102_gsp_flcn = { }; static const struct nvkm_gsp_func -ga102_gsp_r535_54_03 = { +ga102_gsp_r535_113_01 = { .flcn = &ga102_gsp_flcn, .fwsec = &ga102_gsp_fwsec, @@ -178,7 +178,7 @@ ga102_gsp = { static struct nvkm_gsp_fwif ga102_gsps[] = { - { 0, r535_gsp_load, &ga102_gsp_r535_54_03, "535.54.03" }, + { 0, r535_gsp_load, &ga102_gsp_r535_113_01, "535.113.01" }, { -1, gv100_gsp_nofw, &ga102_gsp }, {} }; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c index c24693f265e8..47138d797748 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c @@ -30,37 +30,46 @@ #include <nvfw/fw.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0000.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0005.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0080.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h> -#include <nvrm/535.54.03/common/shared/msgq/inc/msgq/msgq_priv.h> -#include <nvrm/535.54.03/common/uproc/os/common/include/libos_init_args.h> -#include <nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h> -#include <nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h> -#include <nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h> -#include <nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/rmgspseq.h> -#include <nvrm/535.54.03/nvidia/generated/g_allclasses.h> -#include <nvrm/535.54.03/nvidia/generated/g_os_nvoc.h> -#include <nvrm/535.54.03/nvidia/generated/g_rpc-structures.h> -#include <nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h> -#include <nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h> -#include <nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h> -#include <nvrm/535.54.03/nvidia/inc/kernel/gpu/intr/engine_idx.h> -#include <nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_global_enums.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0000.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0005.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0080.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h> +#include <nvrm/535.113.01/common/shared/msgq/inc/msgq/msgq_priv.h> +#include <nvrm/535.113.01/common/uproc/os/common/include/libos_init_args.h> +#include <nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h> +#include <nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h> +#include <nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h> +#include <nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmgspseq.h> +#include <nvrm/535.113.01/nvidia/generated/g_allclasses.h> +#include <nvrm/535.113.01/nvidia/generated/g_os_nvoc.h> +#include <nvrm/535.113.01/nvidia/generated/g_rpc-structures.h> +#include <nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h> +#include <nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h> +#include <nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h> +#include <nvrm/535.113.01/nvidia/inc/kernel/gpu/intr/engine_idx.h> +#include <nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_global_enums.h> #include <linux/acpi.h> +#define GSP_MSG_MIN_SIZE GSP_PAGE_SIZE +#define GSP_MSG_MAX_SIZE GSP_PAGE_MIN_SIZE * 16 + struct r535_gsp_msg { + u8 auth_tag_buffer[16]; + u8 aad_buffer[16]; u32 checksum; u32 sequence; + u32 elem_count; + u32 pad; u8 data[]; }; +#define GSP_MSG_HDR_SIZE offsetof(struct r535_gsp_msg, data) + static void * r535_gsp_msgq_wait(struct nvkm_gsp *gsp, u32 repc, u32 *prepc, int *ptime) { @@ -70,7 +79,7 @@ r535_gsp_msgq_wait(struct nvkm_gsp *gsp, u32 repc, u32 *prepc, int *ptime) u8 *msg; u32 len; - size = DIV_ROUND_UP(sizeof(*mqe) + repc, GSP_PAGE_SIZE); + size = DIV_ROUND_UP(GSP_MSG_HDR_SIZE + repc, GSP_PAGE_SIZE); if (WARN_ON(!size || size >= gsp->msgq.cnt)) return ERR_PTR(-EINVAL); @@ -135,20 +144,25 @@ r535_gsp_cmdq_push(struct nvkm_gsp *gsp, void *argv) struct r535_gsp_msg *cqe; u32 argc = cmd->checksum; u64 *ptr = (void *)cmd; - u64 *end = (void *)cmd->data + argc; + u64 *end; u64 csum = 0; int free, time = 1000000; u32 wptr, size; u32 off = 0; + argc = ALIGN(GSP_MSG_HDR_SIZE + argc, GSP_PAGE_SIZE); + + end = (u64 *)((char *)ptr + argc); + cmd->pad = 0; cmd->checksum = 0; cmd->sequence = gsp->cmdq.seq++; + cmd->elem_count = DIV_ROUND_UP(argc, 0x1000); + while (ptr < end) csum ^= *ptr++; cmd->checksum = upper_32_bits(csum) ^ lower_32_bits(csum); - argc = sizeof(*cmd) + argc; wptr = *gsp->cmdq.wptr; do { do { @@ -193,8 +207,10 @@ static void * r535_gsp_cmdq_get(struct nvkm_gsp *gsp, u32 argc) { struct r535_gsp_msg *cmd; + u32 size = GSP_MSG_HDR_SIZE + argc; - cmd = kvzalloc(sizeof(*cmd) + argc, GFP_KERNEL); + size = ALIGN(size, GSP_MSG_MIN_SIZE); + cmd = kvzalloc(size, GFP_KERNEL); if (!cmd) return ERR_PTR(-ENOMEM); @@ -2168,10 +2184,10 @@ r535_gsp_load(struct nvkm_gsp *gsp, int ver, const struct nvkm_gsp_fwif *fwif) } #define NVKM_GSP_FIRMWARE(chip) \ -MODULE_FIRMWARE("nvidia/"#chip"/gsp/booter_load-535.54.03.bin"); \ -MODULE_FIRMWARE("nvidia/"#chip"/gsp/booter_unload-535.54.03.bin"); \ -MODULE_FIRMWARE("nvidia/"#chip"/gsp/bootloader-535.54.03.bin"); \ -MODULE_FIRMWARE("nvidia/"#chip"/gsp/gsp-535.54.03.bin") +MODULE_FIRMWARE("nvidia/"#chip"/gsp/booter_load-535.113.01.bin"); \ +MODULE_FIRMWARE("nvidia/"#chip"/gsp/booter_unload-535.113.01.bin"); \ +MODULE_FIRMWARE("nvidia/"#chip"/gsp/bootloader-535.113.01.bin"); \ +MODULE_FIRMWARE("nvidia/"#chip"/gsp/gsp-535.113.01.bin") NVKM_GSP_FIRMWARE(tu102); NVKM_GSP_FIRMWARE(tu104); diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c index 999150aa6721..59c5f2b9172a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c @@ -163,7 +163,7 @@ tu102_gsp_flcn = { }; static const struct nvkm_gsp_func -tu102_gsp_r535_54_03 = { +tu102_gsp_r535_113_01 = { .flcn = &tu102_gsp_flcn, .fwsec = &tu102_gsp_fwsec, @@ -185,7 +185,7 @@ tu102_gsp_r535_54_03 = { static struct nvkm_gsp_fwif tu102_gsps[] = { - { 0, r535_gsp_load, &tu102_gsp_r535_54_03, "535.54.03" }, + { 0, r535_gsp_load, &tu102_gsp_r535_113_01, "535.113.01" }, { -1, gv100_gsp_nofw, &gv100_gsp }, {} }; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c index e9f0605abbfd..04fbd9ed28b1 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c @@ -22,7 +22,7 @@ #include "priv.h" static const struct nvkm_gsp_func -tu116_gsp_r535_54_03 = { +tu116_gsp_r535_113_01 = { .flcn = &tu102_gsp_flcn, .fwsec = &tu102_gsp_fwsec, @@ -44,7 +44,7 @@ tu116_gsp_r535_54_03 = { static struct nvkm_gsp_fwif tu116_gsps[] = { - { 0, r535_gsp_load, &tu116_gsp_r535_54_03, "535.54.03" }, + { 0, r535_gsp_load, &tu116_gsp_r535_113_01, "535.113.01" }, { -1, gv100_gsp_nofw, &gv100_gsp }, {} }; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/r535.c index fc6e54e436d0..5f3c9c02a4c0 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/r535.c @@ -26,12 +26,12 @@ #include <nvhw/drf.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/cl84a0.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h> -#include <nvrm/535.54.03/nvidia/generated/g_fbsr_nvoc.h> -#include <nvrm/535.54.03/nvidia/generated/g_rpc-structures.h> -#include <nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_global_enums.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl84a0.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h> +#include <nvrm/535.113.01/nvidia/generated/g_fbsr_nvoc.h> +#include <nvrm/535.113.01/nvidia/generated/g_rpc-structures.h> +#include <nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_global_enums.h> struct fbsr_item { const char *type; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/r535.c index 9cdea8842923..d3e95453f25d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/r535.c @@ -22,9 +22,9 @@ #include "vmm.h" #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/cl90f1.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl90f1.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl90f1.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl90f1.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h> static int r535_mmu_promote_vmm(struct nvkm_vmm *vmm) -- 2.41.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 1/3] nouveau/gsp: move to 535.113.01 @ 2023-10-31 5:18 ` Dave Airlie 0 siblings, 0 replies; 17+ messages in thread From: Dave Airlie @ 2023-10-31 5:18 UTC (permalink / raw) To: dri-devel; +Cc: nouveau From: Dave Airlie <airlied@redhat.com> This moves the initial effort to the latest 535 firmware. The gsp msg structs have changed, and the message passing also. The wpr also seems to have some struct changes. This version of the firmware will be what we are stuck on for a while, until we can refactor the driver and work out a better path forward. Signed-off-by: Dave Airlie <airlied@redhat.com> --- .../sdk/nvidia/inc/alloc/alloc_channel.h | 13 +++- .../common/sdk/nvidia/inc/class/cl0000.h | 4 +- .../common/sdk/nvidia/inc/class/cl0005.h | 2 +- .../common/sdk/nvidia/inc/class/cl0080.h | 2 +- .../common/sdk/nvidia/inc/class/cl2080.h | 2 +- .../nvidia/inc/class/cl2080_notification.h | 2 +- .../common/sdk/nvidia/inc/class/cl84a0.h | 2 +- .../common/sdk/nvidia/inc/class/cl90f1.h | 2 +- .../common/sdk/nvidia/inc/class/clc0b5sw.h | 2 +- .../nvidia/inc/ctrl/ctrl0073/ctrl0073common.h | 2 +- .../nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h | 2 +- .../sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h | 4 +- .../inc/ctrl/ctrl0073/ctrl0073specific.h | 2 +- .../nvidia/inc/ctrl/ctrl0073/ctrl0073system.h | 2 +- .../nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h | 2 +- .../nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h | 2 +- .../sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h | 2 +- .../nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h | 2 +- .../sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h | 2 +- .../nvidia/inc/ctrl/ctrl2080/ctrl2080event.h | 2 +- .../sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h | 2 +- .../nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h | 2 +- .../nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h | 2 +- .../sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h | 2 +- .../inc/ctrl/ctrl2080/ctrl2080internal.h | 2 +- .../common/sdk/nvidia/inc/ctrl/ctrl90f1.h | 2 +- .../nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h | 2 +- .../common/sdk/nvidia/inc/nvlimits.h | 2 +- .../common/sdk/nvidia/inc/nvos.h | 2 +- .../common/shared/msgq/inc/msgq/msgq_priv.h | 2 +- .../uproc/os/common/include/libos_init_args.h | 2 +- .../nvalloc/common/inc/gsp/gsp_fw_sr_meta.h | 2 +- .../nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h | 47 ++++++++---- .../arch/nvalloc/common/inc/rmRiscvUcode.h | 2 +- .../nvidia/arch/nvalloc/common/inc/rmgspseq.h | 2 +- .../nvidia/generated/g_allclasses.h | 2 +- .../nvidia/generated/g_chipset_nvoc.h | 2 +- .../nvidia/generated/g_fbsr_nvoc.h | 2 +- .../nvidia/generated/g_gpu_nvoc.h | 2 +- .../nvidia/generated/g_kernel_channel_nvoc.h | 2 +- .../nvidia/generated/g_kernel_fifo_nvoc.h | 2 +- .../nvidia/generated/g_mem_desc_nvoc.h | 2 +- .../nvidia/generated/g_os_nvoc.h | 2 +- .../nvidia/generated/g_rpc-structures.h | 6 +- .../nvidia/generated/g_sdk-structures.h | 4 +- .../nvidia/inc/kernel/gpu/gpu_acpi_data.h | 4 +- .../nvidia/inc/kernel/gpu/gpu_engine_type.h | 2 +- .../nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h | 2 +- .../nvidia/inc/kernel/gpu/gsp/gsp_init_args.h | 2 +- .../inc/kernel/gpu/gsp/gsp_static_config.h | 26 +++---- .../nvidia/inc/kernel/gpu/intr/engine_idx.h | 2 +- .../nvidia/inc/kernel/gpu/nvbitmask.h | 4 +- .../nvidia/inc/kernel/os/nv_memory_type.h | 2 +- .../nvidia/kernel/inc/vgpu/rpc_global_enums.h | 2 +- .../nvidia/kernel/inc/vgpu/rpc_headers.h | 2 +- .../nvidia/kernel/inc/vgpu/sdk-structures.h | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/ce/r535.c | 4 +- .../gpu/drm/nouveau/nvkm/engine/disp/r535.c | 20 ++--- .../gpu/drm/nouveau/nvkm/engine/fifo/r535.c | 20 ++--- drivers/gpu/drm/nouveau/nvkm/engine/gr/r535.c | 10 +-- .../gpu/drm/nouveau/nvkm/engine/nvdec/r535.c | 2 +- .../gpu/drm/nouveau/nvkm/engine/nvenc/r535.c | 2 +- .../gpu/drm/nouveau/nvkm/engine/nvjpg/r535.c | 2 +- .../gpu/drm/nouveau/nvkm/engine/ofa/r535.c | 2 +- .../gpu/drm/nouveau/nvkm/subdev/bar/r535.c | 6 +- .../gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c | 4 +- .../gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c | 4 +- .../gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c | 4 +- .../gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 76 +++++++++++-------- .../gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c | 4 +- .../gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c | 4 +- .../drm/nouveau/nvkm/subdev/instmem/r535.c | 12 +-- .../gpu/drm/nouveau/nvkm/subdev/mmu/r535.c | 6 +- 73 files changed, 217 insertions(+), 171 deletions(-) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/alloc/alloc_channel.h (93%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/class/cl0000.h (94%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/class/cl0005.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/class/cl0080.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/class/cl2080.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/class/cl2080_notification.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/class/cl84a0.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/class/cl90f1.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/class/clc0b5sw.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrl90f1.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/nvlimits.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/sdk/nvidia/inc/nvos.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/shared/msgq/inc/msgq/msgq_priv.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/common/uproc/os/common/include/libos_init_args.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h (81%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/arch/nvalloc/common/inc/rmgspseq.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_allclasses.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_chipset_nvoc.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_fbsr_nvoc.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_gpu_nvoc.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_kernel_channel_nvoc.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_kernel_fifo_nvoc.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_mem_desc_nvoc.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_os_nvoc.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_rpc-structures.h (95%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/generated/g_sdk-structures.h (94%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/inc/kernel/gpu/gpu_acpi_data.h (95%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/inc/kernel/gpu/gpu_engine_type.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h (86%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/inc/kernel/gpu/intr/engine_idx.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/inc/kernel/gpu/nvbitmask.h (93%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/inc/kernel/os/nv_memory_type.h (97%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/kernel/inc/vgpu/rpc_global_enums.h (99%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/kernel/inc/vgpu/rpc_headers.h (98%) rename drivers/gpu/drm/nouveau/include/nvrm/{535.54.03 => 535.113.01}/nvidia/kernel/inc/vgpu/sdk-structures.h (97%) diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/alloc/alloc_channel.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/alloc/alloc_channel.h similarity index 93% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/alloc/alloc_channel.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/alloc/alloc_channel.h index 29d0b58c25c3..7157c7757698 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/alloc/alloc_channel.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/alloc/alloc_channel.h @@ -1,8 +1,8 @@ #ifndef __src_common_sdk_nvidia_inc_alloc_alloc_channel_h__ #define __src_common_sdk_nvidia_inc_alloc_alloc_channel_h__ -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvlimits.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvlimits.h> -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. @@ -116,6 +116,9 @@ typedef struct NV_MEMORY_DESC_PARAMS { #define NVOS04_FLAGS_SKIP_CTXBUFFER_ALLOC_FALSE 0x00000000 #define NVOS04_FLAGS_SKIP_CTXBUFFER_ALLOC_TRUE 0x00000001 +#define CC_CHAN_ALLOC_IV_SIZE_DWORD 3U +#define CC_CHAN_ALLOC_NONCE_SIZE_DWORD 8U + typedef struct NV_CHANNEL_ALLOC_PARAMS { NvHandle hObjectError; // error context DMA @@ -154,6 +157,12 @@ typedef struct NV_CHANNEL_ALLOC_PARAMS { NV_DECLARE_ALIGNED(NV_MEMORY_DESC_PARAMS eccErrorNotifierMem, 8); // reserved NvU32 ProcessID; // reserved NvU32 SubProcessID; // reserved + // IV used for CPU-side encryption / GPU-side decryption. + NvU32 encryptIv[CC_CHAN_ALLOC_IV_SIZE_DWORD]; // reserved + // IV used for CPU-side decryption / GPU-side encryption. + NvU32 decryptIv[CC_CHAN_ALLOC_IV_SIZE_DWORD]; // reserved + // Nonce used CPU-side signing / GPU-side signature verification. + NvU32 hmacNonce[CC_CHAN_ALLOC_NONCE_SIZE_DWORD]; // reserved } NV_CHANNEL_ALLOC_PARAMS; typedef NV_CHANNEL_ALLOC_PARAMS NV_CHANNELGPFIFO_ALLOCATION_PARAMETERS; diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0000.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0000.h similarity index 94% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0000.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0000.h index dfb3b3e0c45b..7a3fc023072d 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0000.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0000.h @@ -1,8 +1,8 @@ #ifndef __src_common_sdk_nvidia_inc_class_cl0000_h__ #define __src_common_sdk_nvidia_inc_class_cl0000_h__ -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvlimits.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvlimits.h> -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2001-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0005.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0005.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0005.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0005.h index 987bae11ad91..e4de36d63666 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0005.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0005.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_class_cl0005_h__ #define __src_common_sdk_nvidia_inc_class_cl0005_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2001-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0080.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0080.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0080.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0080.h index aeab857b1e50..8868118e47d6 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0080.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0080.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_class_cl0080_h__ #define __src_common_sdk_nvidia_inc_class_cl0080_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2001-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080.h index a0106cd77cd9..9040ea5608a0 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_class_cl2080_h__ #define __src_common_sdk_nvidia_inc_class_cl2080_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2002-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080_notification.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080_notification.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080_notification.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080_notification.h index eea583de08f3..ba659d6477d3 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080_notification.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080_notification.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_class_cl2080_notification_h__ #define __src_common_sdk_nvidia_inc_class_cl2080_notification_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl84a0.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl84a0.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl84a0.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl84a0.h index d96855d42e62..9eb780a1ac72 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl84a0.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl84a0.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_class_cl84a0_h__ #define __src_common_sdk_nvidia_inc_class_cl84a0_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2001-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl90f1.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl90f1.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl90f1.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl90f1.h index 6ed4ed49bbcc..f1d21776e395 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/cl90f1.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/cl90f1.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_class_cl90f1_h__ #define __src_common_sdk_nvidia_inc_class_cl90f1_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2011 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/clc0b5sw.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/clc0b5sw.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/clc0b5sw.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/clc0b5sw.h index 7dcc961cf0dc..b8f32576cfaa 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/clc0b5sw.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/class/clc0b5sw.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_class_clc0b5sw_h__ #define __src_common_sdk_nvidia_inc_class_clc0b5sw_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2014-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h index 9f2b8557c79c..58b3ba7badf1 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073common_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073common_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h index 193f2cbc302b..596f2ea8344e 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073dfp_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073dfp_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2005-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h index 76dafc828064..bae4b1997736 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h @@ -1,8 +1,8 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073dp_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073dp_h__ -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073common.h> -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2005-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h index bf44b28e7603..954958dcf834 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073specific_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073specific_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 1993-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h index 1ff22f06dc82..d69cef3c01fd 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073system_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl0073_ctrl0073system_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2005-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h index 7fda8d2d2067..6acb3f73242d 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl0080_ctrl0080fifo_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl0080_ctrl0080fifo_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2006-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h index 60ba4967dcd9..3db099e62364 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl0080_ctrl0080gpu_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl0080_ctrl0080gpu_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2004-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h index c08e2fcb4979..ed01df925573 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl0080_ctrl0080gr_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl0080_ctrl0080gr_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2004-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h index 9c61a6f74aa4..b5b7631de99b 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080bios_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080bios_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2005-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h index c1e79f64bd03..fe912d2bd183 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080ce_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080ce_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2014-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h index 472702723057..87bc4ff92ce1 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080event_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080event_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2006-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h index 20a50a22e748..68c81f9f803c 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080fb_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080fb_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2006-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h index 8865dd589822..bc0f63699b06 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080fifo_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080fifo_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2006-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h index ce43708a6f18..29d7a1052142 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080gpu_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080gpu_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2006-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h index 6f99038d6e16..59f8895bc5d7 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080gr_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080gr_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2006-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h index cfe53c7cb4ce..e11b2dbe5288 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080internal_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080internal_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2020-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl90f1.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl90f1.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl90f1.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl90f1.h index fbc2794c0341..977e59818533 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl90f1.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl90f1.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl90f1_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrl90f1_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2014-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h index fce434425bdf..684045796232 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_ctrl_ctrla06f_ctrla06fgpfifo_h__ #define __src_common_sdk_nvidia_inc_ctrl_ctrla06f_ctrla06fgpfifo_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2007-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/nvlimits.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/nvlimits.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/nvlimits.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/nvlimits.h index 21f53f46a7b8..5c5a004a8031 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/nvlimits.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/nvlimits.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_nvlimits_h__ #define __src_common_sdk_nvidia_inc_nvlimits_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2017 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h index 7e909d8945cd..51b5591c603e 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h @@ -1,7 +1,7 @@ #ifndef __src_common_sdk_nvidia_inc_nvos_h__ #define __src_common_sdk_nvidia_inc_nvos_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 1993-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/shared/msgq/inc/msgq/msgq_priv.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/shared/msgq/inc/msgq/msgq_priv.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/shared/msgq/inc/msgq/msgq_priv.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/shared/msgq/inc/msgq/msgq_priv.h index 26b096d0e225..5a2f273d95c8 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/shared/msgq/inc/msgq/msgq_priv.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/shared/msgq/inc/msgq/msgq_priv.h @@ -1,7 +1,7 @@ #ifndef __src_common_shared_msgq_inc_msgq_msgq_priv_h__ #define __src_common_shared_msgq_inc_msgq_msgq_priv_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2018-2019 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/uproc/os/common/include/libos_init_args.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/uproc/os/common/include/libos_init_args.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/uproc/os/common/include/libos_init_args.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/uproc/os/common/include/libos_init_args.h index 0aa4b26fda09..83cf1b2c15a3 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/uproc/os/common/include/libos_init_args.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/common/uproc/os/common/include/libos_init_args.h @@ -1,7 +1,7 @@ #ifndef __src_common_uproc_os_common_include_libos_init_args_h__ #define __src_common_uproc_os_common_include_libos_init_args_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2018-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h index e3754a3bfe39..73213bdfcbda 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_arch_nvalloc_common_inc_gsp_gsp_fw_sr_meta_h__ #define __src_nvidia_arch_nvalloc_common_inc_gsp_gsp_fw_sr_meta_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2022-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h similarity index 81% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h index 65efe8985a72..a2e141e4b459 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_arch_nvalloc_common_inc_gsp_gsp_fw_wpr_meta_h__ #define __src_nvidia_arch_nvalloc_common_inc_gsp_gsp_fw_wpr_meta_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2021-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. @@ -115,21 +115,42 @@ typedef struct // be moved to a different comm. mechanism between the bootstrapper // and the GSP-RM tasks. - // Shared partition RPC memory (physical address) - NvU64 partitionRpcAddr; + union + { + struct + { + // Shared partition RPC memory (physical address) + NvU64 partitionRpcAddr; + + // Offsets relative to partitionRpcAddr + NvU16 partitionRpcRequestOffset; + NvU16 partitionRpcReplyOffset; - // Offsets relative to partitionRpcAddr - NvU16 partitionRpcRequestOffset; - NvU16 partitionRpcReplyOffset; + // Code section and dataSection offset and size. + NvU32 elfCodeOffset; + NvU32 elfDataOffset; + NvU32 elfCodeSize; + NvU32 elfDataSize; - // Code section and dataSection offset and size. - NvU32 elfCodeOffset; - NvU32 elfDataOffset; - NvU32 elfCodeSize; - NvU32 elfDataSize; + // Used during GSP-RM resume to check for revocation + NvU32 lsUcodeVersion; + }; - // Used during GSP-RM resume to check for revocation - NvU32 lsUcodeVersion; + struct + { + // Pad for the partitionRpc* fields, plus 4 bytes + NvU32 partitionRpcPadding[4]; + + // CrashCat (contiguous) buffer size/location - occupies same bytes as the + // elf(Code|Data)(Offset|Size) fields above. + // TODO: move to GSP_FMC_INIT_PARAMS + NvU64 sysmemAddrOfCrashReportQueue; + NvU32 sizeOfCrashReportQueue; + + // Pad for the lsUcodeVersion field + NvU32 lsUcodeVersionPadding[1]; + }; + }; // Number of VF partitions allocating sub-heaps from the WPR heap // Used during boot to ensure the heap is adequately sized diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h index da18e7eab940..4eff473e8990 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_arch_nvalloc_common_inc_rmRiscvUcode_h__ #define __src_nvidia_arch_nvalloc_common_inc_rmRiscvUcode_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2018-2019 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/rmgspseq.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmgspseq.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/rmgspseq.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmgspseq.h index 1048205a0e46..341ab0dbeaf2 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/rmgspseq.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmgspseq.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_arch_nvalloc_common_inc_rmgspseq_h__ #define __src_nvidia_arch_nvalloc_common_inc_rmgspseq_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2019-2020 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_allclasses.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_allclasses.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_allclasses.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_allclasses.h index b17520135233..3144e9beac61 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_allclasses.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_allclasses.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_generated_g_allclasses_h__ #define __src_nvidia_generated_g_allclasses_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2021-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_chipset_nvoc.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_chipset_nvoc.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_chipset_nvoc.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_chipset_nvoc.h index 94e79e14cba7..6b8921138c7d 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_chipset_nvoc.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_chipset_nvoc.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_generated_g_chipset_nvoc_h__ #define __src_nvidia_generated_g_chipset_nvoc_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 1993-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_fbsr_nvoc.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_fbsr_nvoc.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_fbsr_nvoc.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_fbsr_nvoc.h index 00198b7ecd23..a5128f00225b 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_fbsr_nvoc.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_fbsr_nvoc.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_generated_g_fbsr_nvoc_h__ #define __src_nvidia_generated_g_fbsr_nvoc_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2009-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_gpu_nvoc.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_gpu_nvoc.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_gpu_nvoc.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_gpu_nvoc.h index 7194a8f02909..5641a21cacca 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_gpu_nvoc.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_gpu_nvoc.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_generated_g_gpu_nvoc_h__ #define __src_nvidia_generated_g_gpu_nvoc_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2004-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_kernel_channel_nvoc.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_kernel_channel_nvoc.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_kernel_channel_nvoc.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_kernel_channel_nvoc.h index c87503317d8f..b5ad55f854dc 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_kernel_channel_nvoc.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_kernel_channel_nvoc.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_generated_g_kernel_channel_nvoc_h__ #define __src_nvidia_generated_g_kernel_channel_nvoc_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2020-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_kernel_fifo_nvoc.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_kernel_fifo_nvoc.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_kernel_fifo_nvoc.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_kernel_fifo_nvoc.h index dd706d126ce6..946954ac5b3d 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_kernel_fifo_nvoc.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_kernel_fifo_nvoc.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_generated_g_kernel_fifo_nvoc_h__ #define __src_nvidia_generated_g_kernel_fifo_nvoc_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2021-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_mem_desc_nvoc.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_mem_desc_nvoc.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_mem_desc_nvoc.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_mem_desc_nvoc.h index dff4bd362772..daabaee41c87 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_mem_desc_nvoc.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_mem_desc_nvoc.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_generated_g_mem_desc_nvoc_h__ #define __src_nvidia_generated_g_mem_desc_nvoc_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 1993-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_os_nvoc.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_os_nvoc.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_os_nvoc.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_os_nvoc.h index 639adbd99545..754c6af42f30 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_os_nvoc.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_os_nvoc.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_generated_g_os_nvoc_h__ #define __src_nvidia_generated_g_os_nvoc_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 1993-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_rpc-structures.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_rpc-structures.h similarity index 95% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_rpc-structures.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_rpc-structures.h index a0ca9fff3f07..8d925e24faea 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_rpc-structures.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_rpc-structures.h @@ -1,9 +1,9 @@ #ifndef __src_nvidia_generated_g_rpc_structures_h__ #define __src_nvidia_generated_g_rpc_structures_h__ -#include <nvrm/535.54.03/nvidia/generated/g_sdk-structures.h> -#include <nvrm/535.54.03/nvidia/kernel/inc/vgpu/sdk-structures.h> +#include <nvrm/535.113.01/nvidia/generated/g_sdk-structures.h> +#include <nvrm/535.113.01/nvidia/kernel/inc/vgpu/sdk-structures.h> -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2008-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_sdk-structures.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_sdk-structures.h similarity index 94% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_sdk-structures.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_sdk-structures.h index fe2d9062a4c4..e9fed4140468 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/generated/g_sdk-structures.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_sdk-structures.h @@ -1,8 +1,8 @@ #ifndef __src_nvidia_generated_g_sdk_structures_h__ #define __src_nvidia_generated_g_sdk_structures_h__ -#include <nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_headers.h> +#include <nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_headers.h> -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2008-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gpu_acpi_data.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_acpi_data.h similarity index 95% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gpu_acpi_data.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_acpi_data.h index 11f822f875d5..af50b11ec3b4 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gpu_acpi_data.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_acpi_data.h @@ -1,8 +1,8 @@ #ifndef __src_nvidia_inc_kernel_gpu_gpu_acpi_data_h__ #define __src_nvidia_inc_kernel_gpu_gpu_acpi_data_h__ -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h> -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gpu_engine_type.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_engine_type.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gpu_engine_type.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_engine_type.h index 90cd9f6c4d9a..e3160c60036d 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gpu_engine_type.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_engine_type.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_inc_kernel_gpu_gpu_engine_type_h__ #define __src_nvidia_inc_kernel_gpu_gpu_engine_type_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2021-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h index 1169ff62160f..3abec59f0cc4 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_inc_kernel_gpu_gsp_gsp_fw_heap_h__ #define __src_nvidia_inc_kernel_gpu_gsp_gsp_fw_heap_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2022-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h index cacd46f3208c..4033a6f85a76 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_inc_kernel_gpu_gsp_gsp_init_args_h__ #define __src_nvidia_inc_kernel_gpu_gsp_gsp_init_args_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2020-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h similarity index 86% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h index 3f99cab47a13..eeab25a5e290 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h @@ -1,18 +1,18 @@ #ifndef __src_nvidia_inc_kernel_gpu_gsp_gsp_static_config_h__ #define __src_nvidia_inc_kernel_gpu_gsp_gsp_static_config_h__ -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h> -#include <nvrm/535.54.03/nvidia/generated/g_chipset_nvoc.h> -#include <nvrm/535.54.03/nvidia/generated/g_gpu_nvoc.h> -#include <nvrm/535.54.03/nvidia/inc/kernel/gpu/gpu_acpi_data.h> -#include <nvrm/535.54.03/nvidia/inc/kernel/gpu/nvbitmask.h> -#include <nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_headers.h> - -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gr.h> +#include <nvrm/535.113.01/nvidia/generated/g_chipset_nvoc.h> +#include <nvrm/535.113.01/nvidia/generated/g_gpu_nvoc.h> +#include <nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_acpi_data.h> +#include <nvrm/535.113.01/nvidia/inc/kernel/gpu/nvbitmask.h> +#include <nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_headers.h> + +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2019-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/intr/engine_idx.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/intr/engine_idx.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/intr/engine_idx.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/intr/engine_idx.h index cca520f61818..bd5e01f9814b 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/intr/engine_idx.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/intr/engine_idx.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_inc_kernel_gpu_intr_engine_idx_h__ #define __src_nvidia_inc_kernel_gpu_intr_engine_idx_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 1993-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/nvbitmask.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/nvbitmask.h similarity index 93% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/nvbitmask.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/nvbitmask.h index 16168294e524..366447a368bf 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/nvbitmask.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/gpu/nvbitmask.h @@ -1,8 +1,8 @@ #ifndef __src_nvidia_inc_kernel_gpu_nvbitmask_h__ #define __src_nvidia_inc_kernel_gpu_nvbitmask_h__ -#include <nvrm/535.54.03/nvidia/inc/kernel/gpu/gpu_engine_type.h> +#include <nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_engine_type.h> -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2021-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/os/nv_memory_type.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/os/nv_memory_type.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/os/nv_memory_type.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/os/nv_memory_type.h index c8f046bb630f..4a850dad4776 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/os/nv_memory_type.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/inc/kernel/os/nv_memory_type.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_inc_kernel_os_nv_memory_type_h__ #define __src_nvidia_inc_kernel_os_nv_memory_type_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2020 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_global_enums.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_global_enums.h similarity index 99% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_global_enums.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_global_enums.h index 5b7ffd56084b..73c57f235f6a 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_global_enums.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_global_enums.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_kernel_inc_vgpu_rpc_global_enums_h__ #define __src_nvidia_kernel_inc_vgpu_rpc_global_enums_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ #ifndef X # define X(UNIT, RPC) NV_VGPU_MSG_FUNCTION_##RPC, diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_headers.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_headers.h similarity index 98% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_headers.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_headers.h index 07143060a9f5..f14b23852456 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_headers.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_headers.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_kernel_inc_vgpu_rpc_headers_h__ #define __src_nvidia_kernel_inc_vgpu_rpc_headers_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2017-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/kernel/inc/vgpu/sdk-structures.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/sdk-structures.h similarity index 97% rename from drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/kernel/inc/vgpu/sdk-structures.h rename to drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/sdk-structures.h index 2dc692ec9352..7801af232dff 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/kernel/inc/vgpu/sdk-structures.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/kernel/inc/vgpu/sdk-structures.h @@ -1,7 +1,7 @@ #ifndef __src_nvidia_kernel_inc_vgpu_sdk_structures_h__ #define __src_nvidia_kernel_inc_vgpu_sdk_structures_h__ -/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */ +/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.113.01 */ /* * SPDX-FileCopyrightText: Copyright (c) 2020-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ce/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/ce/r535.c index 0c6f921d31c3..bd0d435dbbd3 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/ce/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/ce/r535.c @@ -26,8 +26,8 @@ #include <engine/fifo.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080_notification.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/clc0b5sw.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080_notification.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/clc0b5sw.h> struct r535_ce_obj { struct nvkm_object object; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c index 6c54c473bb6d..298035070b3a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c @@ -37,16 +37,16 @@ #include <nvhw/drf.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080_notification.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h> -#include <nvrm/535.54.03/nvidia/generated/g_allclasses.h> -#include <nvrm/535.54.03/nvidia/generated/g_mem_desc_nvoc.h> -#include <nvrm/535.54.03/nvidia/inc/kernel/os/nv_memory_type.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080_notification.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dfp.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073dp.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073specific.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0073/ctrl0073system.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h> +#include <nvrm/535.113.01/nvidia/generated/g_allclasses.h> +#include <nvrm/535.113.01/nvidia/generated/g_mem_desc_nvoc.h> +#include <nvrm/535.113.01/nvidia/inc/kernel/os/nv_memory_type.h> #include <linux/acpi.h> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/r535.c index 14a67cf96204..b374d72fd1c1 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/r535.c @@ -34,16 +34,16 @@ #include <nvhw/drf.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/alloc/alloc_channel.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080_notification.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h> -#include <nvrm/535.54.03/nvidia/generated/g_kernel_channel_nvoc.h> -#include <nvrm/535.54.03/nvidia/generated/g_kernel_fifo_nvoc.h> -#include <nvrm/535.54.03/nvidia/inc/kernel/gpu/gpu_engine_type.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/alloc/alloc_channel.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080_notification.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080ce.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fifo.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrla06f/ctrla06fgpfifo.h> +#include <nvrm/535.113.01/nvidia/generated/g_kernel_channel_nvoc.h> +#include <nvrm/535.113.01/nvidia/generated/g_kernel_fifo_nvoc.h> +#include <nvrm/535.113.01/nvidia/inc/kernel/gpu/gpu_engine_type.h> static u32 r535_chan_doorbell_handle(struct nvkm_chan *chan) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/r535.c index a7501b52137c..f4bed3eb1ec2 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/r535.c @@ -31,11 +31,11 @@ #include <nvhw/drf.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/alloc/alloc_channel.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> -#include <nvrm/535.54.03/nvidia/generated/g_kernel_channel_nvoc.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/alloc/alloc_channel.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080fifo.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> +#include <nvrm/535.113.01/nvidia/generated/g_kernel_channel_nvoc.h> #define r535_gr(p) container_of((p), struct r535_gr, base) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/r535.c index fd6c35e01510..75a24f3e6617 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/r535.c @@ -26,7 +26,7 @@ #include <engine/fifo.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h> struct r535_nvdec_obj { struct nvkm_object object; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/r535.c index 8449b41c72db..c8a2a9196ce5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/r535.c @@ -26,7 +26,7 @@ #include <engine/fifo.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h> struct r535_nvenc_obj { struct nvkm_object object; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/nvjpg/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/nvjpg/r535.c index a054bff98f96..1babddc4eb80 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/nvjpg/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/nvjpg/r535.c @@ -26,7 +26,7 @@ #include <engine/fifo.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h> struct r535_nvjpg_obj { struct nvkm_object object; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ofa/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/ofa/r535.c index b34d6d0a6913..438dc692eefe 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/ofa/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/ofa/r535.c @@ -27,7 +27,7 @@ #include <engine/fifo.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h> struct r535_ofa_obj { struct nvkm_object object; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/r535.c index 461fb8daf596..4135690326f4 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/r535.c @@ -28,9 +28,9 @@ #include <subdev/mmu/vmm.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/nvidia/generated/g_rpc-structures.h> -#include <nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_global_enums.h> -#include <nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_headers.h> +#include <nvrm/535.113.01/nvidia/generated/g_rpc-structures.h> +#include <nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_global_enums.h> +#include <nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_headers.h> static void r535_bar_flush(struct nvkm_bar *bar) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c index 0ca6c397de96..c849c6299c52 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c @@ -22,7 +22,7 @@ #include "priv.h" static const struct nvkm_gsp_func -ad102_gsp_r535_54_03 = { +ad102_gsp_r535_113_01 = { .flcn = &ga102_gsp_flcn, .fwsec = &ga102_gsp_fwsec, @@ -45,7 +45,7 @@ ad102_gsp_r535_54_03 = { static struct nvkm_gsp_fwif ad102_gsps[] = { - { 0, r535_gsp_load, &ad102_gsp_r535_54_03, "535.54.03", true }, + { 0, r535_gsp_load, &ad102_gsp_r535_113_01, "535.113.01", true }, {} }; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c index 8a2c7347f64e..223f68b532ef 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c @@ -39,7 +39,7 @@ ga100_gsp_flcn = { }; static const struct nvkm_gsp_func -ga100_gsp_r535_54_03 = { +ga100_gsp_r535_113_01 = { .flcn = &ga100_gsp_flcn, .fwsec = &tu102_gsp_fwsec, @@ -61,7 +61,7 @@ ga100_gsp_r535_54_03 = { static struct nvkm_gsp_fwif ga100_gsps[] = { - { 0, r535_gsp_load, &ga100_gsp_r535_54_03, "535.54.03" }, + { 0, r535_gsp_load, &ga100_gsp_r535_113_01, "535.113.01" }, { -1, gv100_gsp_nofw, &gv100_gsp }, {} }; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c index 1c41e77d607f..4c4b4168a266 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c @@ -150,7 +150,7 @@ ga102_gsp_flcn = { }; static const struct nvkm_gsp_func -ga102_gsp_r535_54_03 = { +ga102_gsp_r535_113_01 = { .flcn = &ga102_gsp_flcn, .fwsec = &ga102_gsp_fwsec, @@ -178,7 +178,7 @@ ga102_gsp = { static struct nvkm_gsp_fwif ga102_gsps[] = { - { 0, r535_gsp_load, &ga102_gsp_r535_54_03, "535.54.03" }, + { 0, r535_gsp_load, &ga102_gsp_r535_113_01, "535.113.01" }, { -1, gv100_gsp_nofw, &ga102_gsp }, {} }; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c index c24693f265e8..47138d797748 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c @@ -30,37 +30,46 @@ #include <nvfw/fw.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0000.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0005.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/cl0080.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/cl2080.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h> -#include <nvrm/535.54.03/common/shared/msgq/inc/msgq/msgq_priv.h> -#include <nvrm/535.54.03/common/uproc/os/common/include/libos_init_args.h> -#include <nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h> -#include <nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h> -#include <nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h> -#include <nvrm/535.54.03/nvidia/arch/nvalloc/common/inc/rmgspseq.h> -#include <nvrm/535.54.03/nvidia/generated/g_allclasses.h> -#include <nvrm/535.54.03/nvidia/generated/g_os_nvoc.h> -#include <nvrm/535.54.03/nvidia/generated/g_rpc-structures.h> -#include <nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h> -#include <nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h> -#include <nvrm/535.54.03/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h> -#include <nvrm/535.54.03/nvidia/inc/kernel/gpu/intr/engine_idx.h> -#include <nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_global_enums.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0000.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0005.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0080.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h> +#include <nvrm/535.113.01/common/shared/msgq/inc/msgq/msgq_priv.h> +#include <nvrm/535.113.01/common/uproc/os/common/include/libos_init_args.h> +#include <nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_sr_meta.h> +#include <nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/gsp/gsp_fw_wpr_meta.h> +#include <nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmRiscvUcode.h> +#include <nvrm/535.113.01/nvidia/arch/nvalloc/common/inc/rmgspseq.h> +#include <nvrm/535.113.01/nvidia/generated/g_allclasses.h> +#include <nvrm/535.113.01/nvidia/generated/g_os_nvoc.h> +#include <nvrm/535.113.01/nvidia/generated/g_rpc-structures.h> +#include <nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_fw_heap.h> +#include <nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_init_args.h> +#include <nvrm/535.113.01/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h> +#include <nvrm/535.113.01/nvidia/inc/kernel/gpu/intr/engine_idx.h> +#include <nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_global_enums.h> #include <linux/acpi.h> +#define GSP_MSG_MIN_SIZE GSP_PAGE_SIZE +#define GSP_MSG_MAX_SIZE GSP_PAGE_MIN_SIZE * 16 + struct r535_gsp_msg { + u8 auth_tag_buffer[16]; + u8 aad_buffer[16]; u32 checksum; u32 sequence; + u32 elem_count; + u32 pad; u8 data[]; }; +#define GSP_MSG_HDR_SIZE offsetof(struct r535_gsp_msg, data) + static void * r535_gsp_msgq_wait(struct nvkm_gsp *gsp, u32 repc, u32 *prepc, int *ptime) { @@ -70,7 +79,7 @@ r535_gsp_msgq_wait(struct nvkm_gsp *gsp, u32 repc, u32 *prepc, int *ptime) u8 *msg; u32 len; - size = DIV_ROUND_UP(sizeof(*mqe) + repc, GSP_PAGE_SIZE); + size = DIV_ROUND_UP(GSP_MSG_HDR_SIZE + repc, GSP_PAGE_SIZE); if (WARN_ON(!size || size >= gsp->msgq.cnt)) return ERR_PTR(-EINVAL); @@ -135,20 +144,25 @@ r535_gsp_cmdq_push(struct nvkm_gsp *gsp, void *argv) struct r535_gsp_msg *cqe; u32 argc = cmd->checksum; u64 *ptr = (void *)cmd; - u64 *end = (void *)cmd->data + argc; + u64 *end; u64 csum = 0; int free, time = 1000000; u32 wptr, size; u32 off = 0; + argc = ALIGN(GSP_MSG_HDR_SIZE + argc, GSP_PAGE_SIZE); + + end = (u64 *)((char *)ptr + argc); + cmd->pad = 0; cmd->checksum = 0; cmd->sequence = gsp->cmdq.seq++; + cmd->elem_count = DIV_ROUND_UP(argc, 0x1000); + while (ptr < end) csum ^= *ptr++; cmd->checksum = upper_32_bits(csum) ^ lower_32_bits(csum); - argc = sizeof(*cmd) + argc; wptr = *gsp->cmdq.wptr; do { do { @@ -193,8 +207,10 @@ static void * r535_gsp_cmdq_get(struct nvkm_gsp *gsp, u32 argc) { struct r535_gsp_msg *cmd; + u32 size = GSP_MSG_HDR_SIZE + argc; - cmd = kvzalloc(sizeof(*cmd) + argc, GFP_KERNEL); + size = ALIGN(size, GSP_MSG_MIN_SIZE); + cmd = kvzalloc(size, GFP_KERNEL); if (!cmd) return ERR_PTR(-ENOMEM); @@ -2168,10 +2184,10 @@ r535_gsp_load(struct nvkm_gsp *gsp, int ver, const struct nvkm_gsp_fwif *fwif) } #define NVKM_GSP_FIRMWARE(chip) \ -MODULE_FIRMWARE("nvidia/"#chip"/gsp/booter_load-535.54.03.bin"); \ -MODULE_FIRMWARE("nvidia/"#chip"/gsp/booter_unload-535.54.03.bin"); \ -MODULE_FIRMWARE("nvidia/"#chip"/gsp/bootloader-535.54.03.bin"); \ -MODULE_FIRMWARE("nvidia/"#chip"/gsp/gsp-535.54.03.bin") +MODULE_FIRMWARE("nvidia/"#chip"/gsp/booter_load-535.113.01.bin"); \ +MODULE_FIRMWARE("nvidia/"#chip"/gsp/booter_unload-535.113.01.bin"); \ +MODULE_FIRMWARE("nvidia/"#chip"/gsp/bootloader-535.113.01.bin"); \ +MODULE_FIRMWARE("nvidia/"#chip"/gsp/gsp-535.113.01.bin") NVKM_GSP_FIRMWARE(tu102); NVKM_GSP_FIRMWARE(tu104); diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c index 999150aa6721..59c5f2b9172a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c @@ -163,7 +163,7 @@ tu102_gsp_flcn = { }; static const struct nvkm_gsp_func -tu102_gsp_r535_54_03 = { +tu102_gsp_r535_113_01 = { .flcn = &tu102_gsp_flcn, .fwsec = &tu102_gsp_fwsec, @@ -185,7 +185,7 @@ tu102_gsp_r535_54_03 = { static struct nvkm_gsp_fwif tu102_gsps[] = { - { 0, r535_gsp_load, &tu102_gsp_r535_54_03, "535.54.03" }, + { 0, r535_gsp_load, &tu102_gsp_r535_113_01, "535.113.01" }, { -1, gv100_gsp_nofw, &gv100_gsp }, {} }; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c index e9f0605abbfd..04fbd9ed28b1 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c @@ -22,7 +22,7 @@ #include "priv.h" static const struct nvkm_gsp_func -tu116_gsp_r535_54_03 = { +tu116_gsp_r535_113_01 = { .flcn = &tu102_gsp_flcn, .fwsec = &tu102_gsp_fwsec, @@ -44,7 +44,7 @@ tu116_gsp_r535_54_03 = { static struct nvkm_gsp_fwif tu116_gsps[] = { - { 0, r535_gsp_load, &tu116_gsp_r535_54_03, "535.54.03" }, + { 0, r535_gsp_load, &tu116_gsp_r535_113_01, "535.113.01" }, { -1, gv100_gsp_nofw, &gv100_gsp }, {} }; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/r535.c index fc6e54e436d0..5f3c9c02a4c0 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/r535.c @@ -26,12 +26,12 @@ #include <nvhw/drf.h> #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/cl84a0.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h> -#include <nvrm/535.54.03/nvidia/generated/g_fbsr_nvoc.h> -#include <nvrm/535.54.03/nvidia/generated/g_rpc-structures.h> -#include <nvrm/535.54.03/nvidia/kernel/inc/vgpu/rpc_global_enums.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl84a0.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h> +#include <nvrm/535.113.01/nvidia/generated/g_fbsr_nvoc.h> +#include <nvrm/535.113.01/nvidia/generated/g_rpc-structures.h> +#include <nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_global_enums.h> struct fbsr_item { const char *type; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/r535.c index 9cdea8842923..d3e95453f25d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/r535.c @@ -22,9 +22,9 @@ #include "vmm.h" #include <nvrm/nvtypes.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/class/cl90f1.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl90f1.h> -#include <nvrm/535.54.03/common/sdk/nvidia/inc/nvos.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl90f1.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/ctrl/ctrl90f1.h> +#include <nvrm/535.113.01/common/sdk/nvidia/inc/nvos.h> static int r535_mmu_promote_vmm(struct nvkm_vmm *vmm) -- 2.41.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Nouveau] [PATCH 2/3] nouveau/gsp: fix message signature. 2023-10-31 5:18 ` Dave Airlie @ 2023-10-31 5:18 ` Dave Airlie -1 siblings, 0 replies; 17+ messages in thread From: Dave Airlie @ 2023-10-31 5:18 UTC (permalink / raw) To: dri-devel; +Cc: nouveau From: Dave Airlie <airlied@redhat.com> This original one was backwards, compared to traces from nvidia driver. Signed-off-by: Dave Airlie <airlied@redhat.com> --- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c index 47138d797748..b6f6b5e747d4 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c @@ -693,7 +693,7 @@ r535_gsp_rpc_get(struct nvkm_gsp *gsp, u32 fn, u32 argc) return NULL; rpc->header_version = 0x03000000; - rpc->signature = ('V' << 24) | ('R' << 16) | ('P' << 8) | 'C'; + rpc->signature = ('C' << 24) | ('P' << 16) | ('R' << 8) | 'V'; rpc->function = fn; rpc->rpc_result = 0xffffffff; rpc->rpc_result_private = 0xffffffff; -- 2.41.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 2/3] nouveau/gsp: fix message signature. @ 2023-10-31 5:18 ` Dave Airlie 0 siblings, 0 replies; 17+ messages in thread From: Dave Airlie @ 2023-10-31 5:18 UTC (permalink / raw) To: dri-devel; +Cc: nouveau From: Dave Airlie <airlied@redhat.com> This original one was backwards, compared to traces from nvidia driver. Signed-off-by: Dave Airlie <airlied@redhat.com> --- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c index 47138d797748..b6f6b5e747d4 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c @@ -693,7 +693,7 @@ r535_gsp_rpc_get(struct nvkm_gsp *gsp, u32 fn, u32 argc) return NULL; rpc->header_version = 0x03000000; - rpc->signature = ('V' << 24) | ('R' << 16) | ('P' << 8) | 'C'; + rpc->signature = ('C' << 24) | ('P' << 16) | ('R' << 8) | 'V'; rpc->function = fn; rpc->rpc_result = 0xffffffff; rpc->rpc_result_private = 0xffffffff; -- 2.41.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Nouveau] [PATCH 3/3] nouveau/gsp: add some basic registry entries. 2023-10-31 5:18 ` Dave Airlie @ 2023-10-31 5:18 ` Dave Airlie -1 siblings, 0 replies; 17+ messages in thread From: Dave Airlie @ 2023-10-31 5:18 UTC (permalink / raw) To: dri-devel; +Cc: nouveau From: Dave Airlie <airlied@redhat.com> The nvidia driver sets these two basic registry entries always, so copy it. Signed-off-by: Dave Airlie <airlied@redhat.com> --- .../gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 45 ++++++++++++++----- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c index b6f6b5e747d4..5bd38b1de226 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c @@ -1029,26 +1029,51 @@ r535_gsp_rpc_unloading_guest_driver(struct nvkm_gsp *gsp, bool suspend) return nvkm_gsp_rpc_wr(gsp, rpc, true); } +/* dword only */ +struct nv_gsp_registry_entries { + const char *name; + uint32_t value; +}; + +#define NV_GSP_REG_NUM_ENTRIES 2 + +static const struct nv_gsp_registry_entries r535_registry_entries[NV_GSP_REG_NUM_ENTRIES] = { + { "RMSecBusResetEnable", 1 }, + { "RMForcePcieConfigSave", 1 }, +}; + static int r535_gsp_rpc_set_registry(struct nvkm_gsp *gsp) { PACKED_REGISTRY_TABLE *rpc; char *strings; + int str_offset; + int i; + size_t rpc_size = sizeof(*rpc) + sizeof(rpc->entries[0]) * NV_GSP_REG_NUM_ENTRIES; - rpc = nvkm_gsp_rpc_get(gsp, NV_VGPU_MSG_FUNCTION_SET_REGISTRY, - sizeof(*rpc) + sizeof(rpc->entries[0]) + 1); + /* add strings + null terminator */ + for (i = 0; i < NV_GSP_REG_NUM_ENTRIES; i++) + rpc_size += strlen(r535_registry_entries[i].name) + 1; + + rpc = nvkm_gsp_rpc_get(gsp, NV_VGPU_MSG_FUNCTION_SET_REGISTRY, rpc_size); if (IS_ERR(rpc)) return PTR_ERR(rpc); rpc->size = sizeof(*rpc); - rpc->numEntries = 1; - rpc->entries[0].nameOffset = offsetof(typeof(*rpc), entries[1]); - rpc->entries[0].type = 1; - rpc->entries[0].data = 0; - rpc->entries[0].length = 4; - - strings = (char *)&rpc->entries[1]; - strings[0] = '\0'; + rpc->numEntries = NV_GSP_REG_NUM_ENTRIES; + + str_offset = offsetof(typeof(*rpc), entries[NV_GSP_REG_NUM_ENTRIES]); + strings = (char *)&rpc->entries[NV_GSP_REG_NUM_ENTRIES]; + for (i = 0; i < NV_GSP_REG_NUM_ENTRIES; i++) { + int name_len = strlen(r535_registry_entries[i].name) + 1; + rpc->entries[i].nameOffset = str_offset; + rpc->entries[i].type = 1; + rpc->entries[i].data = r535_registry_entries[i].value; + rpc->entries[i].length = 4; + memcpy(strings, r535_registry_entries[i].name, name_len); + strings += name_len; + str_offset += name_len; + } return nvkm_gsp_rpc_wr(gsp, rpc, false); } -- 2.41.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 3/3] nouveau/gsp: add some basic registry entries. @ 2023-10-31 5:18 ` Dave Airlie 0 siblings, 0 replies; 17+ messages in thread From: Dave Airlie @ 2023-10-31 5:18 UTC (permalink / raw) To: dri-devel; +Cc: nouveau From: Dave Airlie <airlied@redhat.com> The nvidia driver sets these two basic registry entries always, so copy it. Signed-off-by: Dave Airlie <airlied@redhat.com> --- .../gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 45 ++++++++++++++----- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c index b6f6b5e747d4..5bd38b1de226 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c @@ -1029,26 +1029,51 @@ r535_gsp_rpc_unloading_guest_driver(struct nvkm_gsp *gsp, bool suspend) return nvkm_gsp_rpc_wr(gsp, rpc, true); } +/* dword only */ +struct nv_gsp_registry_entries { + const char *name; + uint32_t value; +}; + +#define NV_GSP_REG_NUM_ENTRIES 2 + +static const struct nv_gsp_registry_entries r535_registry_entries[NV_GSP_REG_NUM_ENTRIES] = { + { "RMSecBusResetEnable", 1 }, + { "RMForcePcieConfigSave", 1 }, +}; + static int r535_gsp_rpc_set_registry(struct nvkm_gsp *gsp) { PACKED_REGISTRY_TABLE *rpc; char *strings; + int str_offset; + int i; + size_t rpc_size = sizeof(*rpc) + sizeof(rpc->entries[0]) * NV_GSP_REG_NUM_ENTRIES; - rpc = nvkm_gsp_rpc_get(gsp, NV_VGPU_MSG_FUNCTION_SET_REGISTRY, - sizeof(*rpc) + sizeof(rpc->entries[0]) + 1); + /* add strings + null terminator */ + for (i = 0; i < NV_GSP_REG_NUM_ENTRIES; i++) + rpc_size += strlen(r535_registry_entries[i].name) + 1; + + rpc = nvkm_gsp_rpc_get(gsp, NV_VGPU_MSG_FUNCTION_SET_REGISTRY, rpc_size); if (IS_ERR(rpc)) return PTR_ERR(rpc); rpc->size = sizeof(*rpc); - rpc->numEntries = 1; - rpc->entries[0].nameOffset = offsetof(typeof(*rpc), entries[1]); - rpc->entries[0].type = 1; - rpc->entries[0].data = 0; - rpc->entries[0].length = 4; - - strings = (char *)&rpc->entries[1]; - strings[0] = '\0'; + rpc->numEntries = NV_GSP_REG_NUM_ENTRIES; + + str_offset = offsetof(typeof(*rpc), entries[NV_GSP_REG_NUM_ENTRIES]); + strings = (char *)&rpc->entries[NV_GSP_REG_NUM_ENTRIES]; + for (i = 0; i < NV_GSP_REG_NUM_ENTRIES; i++) { + int name_len = strlen(r535_registry_entries[i].name) + 1; + rpc->entries[i].nameOffset = str_offset; + rpc->entries[i].type = 1; + rpc->entries[i].data = r535_registry_entries[i].value; + rpc->entries[i].length = 4; + memcpy(strings, r535_registry_entries[i].name, name_len); + strings += name_len; + str_offset += name_len; + } return nvkm_gsp_rpc_wr(gsp, rpc, false); } -- 2.41.0 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [Nouveau] [PATCH 3/3] nouveau/gsp: add some basic registry entries. 2023-10-31 5:18 ` Dave Airlie (?) @ 2023-10-31 15:52 ` Timur Tabi 2023-10-31 19:29 ` Dave Airlie -1 siblings, 1 reply; 17+ messages in thread From: Timur Tabi @ 2023-10-31 15:52 UTC (permalink / raw) To: Dave Airlie; +Cc: nouveau, dri-devel On Tue, Oct 31, 2023 at 12:20 AM Dave Airlie <airlied@gmail.com> wrote: > +#define NV_GSP_REG_NUM_ENTRIES 2 > + > +static const struct nv_gsp_registry_entries r535_registry_entries[NV_GSP_REG_NUM_ENTRIES] = { > + { "RMSecBusResetEnable", 1 }, > + { "RMForcePcieConfigSave", 1 }, > +}; How about : static const struct nv_gsp_registry_entries r535_registry_entries[] = { { "RMSecBusResetEnable", 1 }, { "RMForcePcieConfigSave", 1 }, }; #define NV_GSP_REG_NUM_ENTRIES ARRAY_SIZE(r535_registry_entries) ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Nouveau] [PATCH 3/3] nouveau/gsp: add some basic registry entries. 2023-10-31 15:52 ` [Nouveau] " Timur Tabi @ 2023-10-31 19:29 ` Dave Airlie 2023-10-31 20:02 ` Timur Tabi 0 siblings, 1 reply; 17+ messages in thread From: Dave Airlie @ 2023-10-31 19:29 UTC (permalink / raw) To: Timur Tabi; +Cc: nouveau, dri-devel On Wed, 1 Nov 2023 at 01:53, Timur Tabi <timur@kernel.org> wrote: > > On Tue, Oct 31, 2023 at 12:20 AM Dave Airlie <airlied@gmail.com> wrote: > > +#define NV_GSP_REG_NUM_ENTRIES 2 > > + > > +static const struct nv_gsp_registry_entries r535_registry_entries[NV_GSP_REG_NUM_ENTRIES] = { > > + { "RMSecBusResetEnable", 1 }, > > + { "RMForcePcieConfigSave", 1 }, > > +}; > > How about : > > static const struct nv_gsp_registry_entries r535_registry_entries[] = { > { "RMSecBusResetEnable", 1 }, > { "RMForcePcieConfigSave", 1 }, > }; > > #define NV_GSP_REG_NUM_ENTRIES ARRAY_SIZE(r535_registry_entries) Good plan. I'll change that now. Dave. ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Nouveau] [PATCH 3/3] nouveau/gsp: add some basic registry entries. 2023-10-31 19:29 ` Dave Airlie @ 2023-10-31 20:02 ` Timur Tabi 0 siblings, 0 replies; 17+ messages in thread From: Timur Tabi @ 2023-10-31 20:02 UTC (permalink / raw) To: airlied@gmail.com Cc: nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org On Wed, 2023-11-01 at 05:29 +1000, Dave Airlie wrote: > > > > static const struct nv_gsp_registry_entries r535_registry_entries[] = { > > { "RMSecBusResetEnable", 1 }, > > { "RMForcePcieConfigSave", 1 }, > > }; > > > > #define NV_GSP_REG_NUM_ENTRIES ARRAY_SIZE(r535_registry_entries) > > Good plan. I'll change that now. BTW, I looked into these two options. Basically, these options enable "secondary bus reset", although I'm not exactly sure what that means. It does enable saving of PCI config registers, so perhaps it preserves those registers for Nouveau when GSP-RM does a PCI reset. Also, like I mentioned on IRC earlier, I've got a bunch of patches that provide mroe robust registry control, including setting options from the command-line. I'll post those upstream once the dust has settled. ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Nouveau] [PATCH 3/3] nouveau/gsp: add some basic registry entries. 2023-10-31 5:18 ` Dave Airlie (?) (?) @ 2023-11-07 18:51 ` Timur Tabi 2023-11-07 18:54 ` Dave Airlie -1 siblings, 1 reply; 17+ messages in thread From: Timur Tabi @ 2023-11-07 18:51 UTC (permalink / raw) To: dri-devel@lists.freedesktop.org, airlied@gmail.com Cc: nouveau@lists.freedesktop.org [-- Attachment #1: Type: text/plain, Size: 1189 bytes --] On Tue, 2023-10-31 at 15:18 +1000, Dave Airlie wrote: + strings = (char *)&rpc->entries[NV_GSP_REG_NUM_ENTRIES]; I get a UBSAN index-out-of-bounds error on boot at this line. [ 17.765746] nouveau 0000:65:00.0: gsp: cmdq: wptr 1 [ 17.765748] ================================================================================ [ 17.774170] UBSAN: array-index-out-of-bounds in drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c:1065:33 [ 17.783449] index 2 is out of range for type 'PACKED_REGISTRY_ENTRY [*]' [ 17.790132] CPU: 0 PID: 234 Comm: kworker/0:4 Not tainted 6.6.0-rc5+ #1 [ 17.790135] Hardware name: ASUS X299-A/PRIME X299-A, BIOS 2002 09/25/2019 [ 17.790136] Workqueue: events work_for_cpu_fn [ 17.790143] Call Trace: [ 17.790145] <TASK> [ 17.790148] dump_stack_lvl+0x48/0x70 [ 17.790155] dump_stack+0x10/0x20 [ 17.790156] __ubsan_handle_out_of_bounds+0xc6/0x110 [ 17.790160] r535_gsp_oneinit+0xf81/0x1530 [nouveau] [ 17.790292] ? __dev_printk+0x39/0xa0 [ 17.790295] ? _dev_info+0x75/0xa0 [ 17.790298] tu102_gsp_oneinit+0x9b/0xd0 [nouveau] I'm not sure what the fix is. Do we need __attribute__((no_sanitize("array-bounds"))) on PACKED_REGISTRY_TABLE? [-- Attachment #2: Type: text/html, Size: 1814 bytes --] ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Nouveau] [PATCH 3/3] nouveau/gsp: add some basic registry entries. 2023-11-07 18:51 ` Timur Tabi @ 2023-11-07 18:54 ` Dave Airlie 2023-11-07 19:02 ` Timur Tabi 0 siblings, 1 reply; 17+ messages in thread From: Dave Airlie @ 2023-11-07 18:54 UTC (permalink / raw) To: Timur Tabi; +Cc: nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org On Wed, 8 Nov 2023 at 04:51, Timur Tabi <ttabi@nvidia.com> wrote: > > On Tue, 2023-10-31 at 15:18 +1000, Dave Airlie wrote: > > + strings = (char *)&rpc->entries[NV_GSP_REG_NUM_ENTRIES]; > > > I get a UBSAN index-out-of-bounds error on boot at this line. > > [ 17.765746] nouveau 0000:65:00.0: gsp: cmdq: wptr 1 > [ 17.765748] ================================================================================ > [ 17.774170] UBSAN: array-index-out-of-bounds in drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c:1065:33 > [ 17.783449] index 2 is out of range for type 'PACKED_REGISTRY_ENTRY [*]' > [ 17.790132] CPU: 0 PID: 234 Comm: kworker/0:4 Not tainted 6.6.0-rc5+ #1 > [ 17.790135] Hardware name: ASUS X299-A/PRIME X299-A, BIOS 2002 09/25/2019 > [ 17.790136] Workqueue: events work_for_cpu_fn > [ 17.790143] Call Trace: > [ 17.790145] <TASK> > [ 17.790148] dump_stack_lvl+0x48/0x70 > [ 17.790155] dump_stack+0x10/0x20 > [ 17.790156] __ubsan_handle_out_of_bounds+0xc6/0x110 > [ 17.790160] r535_gsp_oneinit+0xf81/0x1530 [nouveau] > [ 17.790292] ? __dev_printk+0x39/0xa0 > [ 17.790295] ? _dev_info+0x75/0xa0 > [ 17.790298] tu102_gsp_oneinit+0x9b/0xd0 [nouveau] > > I'm not sure what the fix is. Do we need __attribute__((no_sanitize("array-bounds"))) on PACKED_REGISTRY_TABLE? yes that is probably the right answer for this, if we want to reuse the structs that we get from the nvidia driver. Dave. ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Nouveau] [PATCH 3/3] nouveau/gsp: add some basic registry entries. 2023-11-07 18:54 ` Dave Airlie @ 2023-11-07 19:02 ` Timur Tabi 0 siblings, 0 replies; 17+ messages in thread From: Timur Tabi @ 2023-11-07 19:02 UTC (permalink / raw) To: airlied@gmail.com Cc: nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org [-- Attachment #1: Type: text/plain, Size: 201 bytes --] On Wed, 2023-11-08 at 04:54 +1000, Dave Airlie wrote: yes that is probably the right answer for this, if we want to reuse the structs that we get from the nvidia driver. ok, I'll submit a patch. [-- Attachment #2: Type: text/html, Size: 529 bytes --] ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Nouveau] [PATCH 3/3] nouveau/gsp: add some basic registry entries. 2023-10-31 5:18 ` Dave Airlie ` (2 preceding siblings ...) (?) @ 2023-11-27 20:47 ` Timur Tabi 2023-11-27 21:32 ` Dave Airlie -1 siblings, 1 reply; 17+ messages in thread From: Timur Tabi @ 2023-11-27 20:47 UTC (permalink / raw) To: Dave Airlie; +Cc: nouveau, dri-devel On Tue, Oct 31, 2023 at 12:20 AM Dave Airlie <airlied@gmail.com> wrote: > rpc->size = sizeof(*rpc); > - rpc->numEntries = 1; > - rpc->entries[0].nameOffset = offsetof(typeof(*rpc), entries[1]); > - rpc->entries[0].type = 1; > - rpc->entries[0].data = 0; > - rpc->entries[0].length = 4; > - > - strings = (char *)&rpc->entries[1]; > - strings[0] = '\0'; > + rpc->numEntries = NV_GSP_REG_NUM_ENTRIES; > + > + str_offset = offsetof(typeof(*rpc), entries[NV_GSP_REG_NUM_ENTRIES]); > + strings = (char *)&rpc->entries[NV_GSP_REG_NUM_ENTRIES]; > + for (i = 0; i < NV_GSP_REG_NUM_ENTRIES; i++) { > + int name_len = strlen(r535_registry_entries[i].name) + 1; > + rpc->entries[i].nameOffset = str_offset; > + rpc->entries[i].type = 1; > + rpc->entries[i].data = r535_registry_entries[i].value; > + rpc->entries[i].length = 4; > + memcpy(strings, r535_registry_entries[i].name, name_len); > + strings += name_len; > + str_offset += name_len; > + } I'm working on a patch that replaces this code with a dynamically-generated registry so that we can set registry keys via the driver's command-line (like the Nvidia driver). However, you have a bug here. rpc->size must be the total size of the RPC, including all the PACKED_REGISTRY_ENTRY structs and the strings that follow them. You can see this by looking at RmPackageRegistry() and regCountEntriesAndSize() in OpenRM. ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Nouveau] [PATCH 3/3] nouveau/gsp: add some basic registry entries. 2023-11-27 20:47 ` Timur Tabi @ 2023-11-27 21:32 ` Dave Airlie 0 siblings, 0 replies; 17+ messages in thread From: Dave Airlie @ 2023-11-27 21:32 UTC (permalink / raw) To: Timur Tabi; +Cc: nouveau, dri-devel On Tue, 28 Nov 2023 at 06:48, Timur Tabi <timur@kernel.org> wrote: > > On Tue, Oct 31, 2023 at 12:20 AM Dave Airlie <airlied@gmail.com> wrote: > > rpc->size = sizeof(*rpc); > > - rpc->numEntries = 1; > > - rpc->entries[0].nameOffset = offsetof(typeof(*rpc), entries[1]); > > - rpc->entries[0].type = 1; > > - rpc->entries[0].data = 0; > > - rpc->entries[0].length = 4; > > - > > - strings = (char *)&rpc->entries[1]; > > - strings[0] = '\0'; > > + rpc->numEntries = NV_GSP_REG_NUM_ENTRIES; > > + > > + str_offset = offsetof(typeof(*rpc), entries[NV_GSP_REG_NUM_ENTRIES]); > > + strings = (char *)&rpc->entries[NV_GSP_REG_NUM_ENTRIES]; > > + for (i = 0; i < NV_GSP_REG_NUM_ENTRIES; i++) { > > + int name_len = strlen(r535_registry_entries[i].name) + 1; > > + rpc->entries[i].nameOffset = str_offset; > > + rpc->entries[i].type = 1; > > + rpc->entries[i].data = r535_registry_entries[i].value; > > + rpc->entries[i].length = 4; > > + memcpy(strings, r535_registry_entries[i].name, name_len); > > + strings += name_len; > > + str_offset += name_len; > > + } > > I'm working on a patch that replaces this code with a > dynamically-generated registry so that we can set registry keys via > the driver's command-line (like the Nvidia driver). I'm not sure we'd want that, except maybe as a debugging aid, I'd really like to have nouveau just pick the correct set of registry entries, but I suppose there might be some cases where setting the from the command line would be good for testing. > a bug here. rpc->size must be the total size of the RPC, including > all the PACKED_REGISTRY_ENTRY structs and the strings that follow > them. You can see this by looking at RmPackageRegistry() and > regCountEntriesAndSize() in OpenRM. Oh interesting, I'll take a look today. Dave. ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Nouveau] nouveau/gsp: move to latest fw and small fixes 2023-10-31 5:18 ` Dave Airlie ` (3 preceding siblings ...) (?) @ 2023-11-03 2:03 ` Danilo Krummrich -1 siblings, 0 replies; 17+ messages in thread From: Danilo Krummrich @ 2023-11-03 2:03 UTC (permalink / raw) To: Dave Airlie, dri-devel; +Cc: nouveau For the series: Reviewed-by: Danilo Krummrich <dakr@redhat.com> On 10/31/23 06:18, Dave Airlie wrote: > This moves Ben's work to the latest GSP stable firmware 535.113.01. > We will be stuck on this for a while. > > There is also a fix for a message signature, and additions of two > registry entries, which seem to help recover from crashes. > > Dave. > > ^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2024-01-16 11:47 UTC | newest] Thread overview: 17+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-10-31 5:18 [Nouveau] nouveau/gsp: move to latest fw and small fixes Dave Airlie 2023-10-31 5:18 ` Dave Airlie 2023-10-31 5:18 ` [Nouveau] [PATCH 1/3] nouveau/gsp: move to 535.113.01 Dave Airlie 2023-10-31 5:18 ` Dave Airlie 2023-10-31 5:18 ` [Nouveau] [PATCH 2/3] nouveau/gsp: fix message signature Dave Airlie 2023-10-31 5:18 ` Dave Airlie 2023-10-31 5:18 ` [Nouveau] [PATCH 3/3] nouveau/gsp: add some basic registry entries Dave Airlie 2023-10-31 5:18 ` Dave Airlie 2023-10-31 15:52 ` [Nouveau] " Timur Tabi 2023-10-31 19:29 ` Dave Airlie 2023-10-31 20:02 ` Timur Tabi 2023-11-07 18:51 ` Timur Tabi 2023-11-07 18:54 ` Dave Airlie 2023-11-07 19:02 ` Timur Tabi 2023-11-27 20:47 ` Timur Tabi 2023-11-27 21:32 ` Dave Airlie 2023-11-03 2:03 ` [Nouveau] nouveau/gsp: move to latest fw and small fixes Danilo Krummrich
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.