550.54.14

src/nvidia/inc/kernel/gpu/gpu_shared_data_map.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2022-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -38,7 +38,6 @@ typedef struct RusdQueryCache RUSD_QUERY_CACHE;
 typedef struct GpuSharedDataMap {
     MEMORY_DESCRIPTOR *pMemDesc;
     NvP64 pMapBuffer;
-    NvP64 pMapBufferPriv;
     NvU64 lastPolledDataMask;
     NvU32 processId;
 
@@ -63,8 +62,5 @@ NV00DE_SHARED_DATA * gpushareddataWriteStart(OBJGPU *pGpu);
 // Finish data write, pushes data cached by above into mapped data
 void gpushareddataWriteFinish(OBJGPU *pGpu);
 
-// Unmap and free memory in GpuSharedDataMap
-void gpushareddataDestroy(OBJGPU *pGpu);
-
 #endif /* GPU_SHARED_DATA_MAP_H */
 

src/nvidia/inc/kernel/gpu/gsp/gsp_static_config.h

@@ -180,6 +180,7 @@ typedef struct GspSystemInfo
     NvU64 sysTimerOffsetNs;
     GSP_VF_INFO gspVFInfo;
     NvBool isGridBuild;
+    NvU32 gridBuildCsp;
 } GspSystemInfo;
 
 

src/nvidia/inc/kernel/gpu/mem_mgr/phys_mem_allocator/phys_mem_allocator.h

@@ -163,6 +163,11 @@ typedef enum
     MEMORY_PROTECTION_PROTECTED   = 1
 } MEMORY_PROTECTION;
 
+/*!
+ * @brief Callback to update stats in RUSD
+ */
+typedef void (*pmaUpdateStatsCb_t)(void *pCtx, NvU64 freeFrames);
+
 /*!
  * @brief Callbacks to UVM for eviction
  */
@@ -255,6 +260,10 @@ struct _PMA
     PMA_BLACKLIST_CHUNK    *pBlacklistChunks;                   // Tracking for blacklist pages
     NvU32                   blacklistCount;                     // Number of blacklist pages
     NvBool                  bClientManagedBlacklist;            // Blacklisted pages in PMA that will be taken over by Client
+
+    // RUSD Callback
+    pmaUpdateStatsCb_t      pStatsUpdateCb;                     // RUSD update free pages
+    void                   *pStatsUpdateCtx;                    // Context for RUSD update
 };
 
 /*!
@@ -575,6 +584,22 @@ NV_STATUS pmaScrubComplete(PMA *pPma);
  */
 NV_STATUS pmaRegisterEvictionCb(PMA *pPma, pmaEvictPagesCb_t evictPagesCb, pmaEvictRangeCb_t evictRangeCb, void *ctxPtr);
 
+/*!
+ * Register the stats update callback.
+ *
+ * Register callback to call when number of free pages changes. Currently only used for RUSD.
+ *
+ * @param[in] pma
+ *      PMA object
+ *
+ * @param[in] pUpdateCb
+ *      The callback to call when updating free page count
+ *
+ * @param[in] ctxPtr
+ *      The callback context pointer to be passed back on callback
+ */
+void pmaRegisterUpdateStatsCb(PMA *pPma, pmaUpdateStatsCb_t pUpdateCb, void *ctxPtr);
+
 
 /*!
  * Unregister the eviction callbacks.

src/nvidia/inc/kernel/rmapi/nv_gpu_ops.h

@@ -273,9 +273,11 @@ NV_STATUS nvGpuOpsPagingChannelPushStream(UvmGpuPagingChannel *channel,
                                           char *methodStream,
                                           NvU32 methodStreamSize);
 
-NV_STATUS nvGpuOpsFlushReplayableFaultBuffer(struct gpuDevice *device);
+NV_STATUS nvGpuOpsFlushReplayableFaultBuffer(gpuFaultInfo *pFaultInfo,
+                                             NvBool bCopyAndFlush);
 
-NV_STATUS nvGpuOpsTogglePrefetchFaults(gpuFaultInfo *pFaultInfo, NvBool bEnable);
+NV_STATUS nvGpuOpsTogglePrefetchFaults(gpuFaultInfo *pFaultInfo,
+                                       NvBool bEnable);
 
 // Interface used for CCSL
 

src/nvidia/inc/kernel/rmapi/rmapi_utils.h

@@ -60,7 +60,8 @@ NvBool rmapiutilIsExternalClassIdInternalOnly(NvU32 externalClassId);
 // Return the flags and access right associated with this RM control command
 //
 
-NV_STATUS rmapiutilGetControlInfo(NvU32 cmd, NvU32 *pFlags, NvU32 *pAccessRight);
+NV_STATUS rmapiutilGetControlInfo(NvU32 cmd, NvU32 *pFlags,
+                                  NvU32 *pAccessRight, NvU32 *pParamsSize);
 
 NvBool rmapiutilSkipErrorMessageForUnsupportedVgpuGuestControl(NvU32 cmd);