From 14ecd5f21d0e75eb000268678f73fc83fc1c6ed0 Mon Sep 17 00:00:00 2001
From: Aaron Plattner <aplattner@nvidia.com>
Date: Wed, 10 Nov 2021 11:10:55 -0800
Subject: 470.86

---
 install-from-cwd.c | 6 ++++++
 nvidia-installer.c | 4 ++++
 nvidia-installer.h | 1 +
 option_table.h     | 7 +++++++
 version.mk         | 2 +-
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/install-from-cwd.c b/install-from-cwd.c
index b14251a..04830b1 100644
--- a/install-from-cwd.c
+++ b/install-from-cwd.c
@@ -69,6 +69,12 @@ static const KernelModuleInfo optional_modules[] = {
          .disable_option = "no-drm",
          .option_offset = offsetof(Options, install_drm),
     },
+    {
+        .module_name = "nvidia-peermem",
+        .optional_module_dependee = "GPUDirect RDMA p2p memory sharing",
+        .disable_option = "no-peermem",
+        .option_offset = offsetof(Options, install_peermem),
+    },
 };
 
 /*
diff --git a/nvidia-installer.c b/nvidia-installer.c
index ac0a848..e74b6e2 100644
--- a/nvidia-installer.c
+++ b/nvidia-installer.c
@@ -139,6 +139,7 @@ static Options *load_default_options(void)
     op->check_for_alternate_installs = TRUE;
     op->install_uvm = TRUE;
     op->install_drm = TRUE;
+    op->install_peermem = TRUE;
     op->install_compat32_libs = NV_OPTIONAL_BOOL_DEFAULT;
     op->install_libglx_indirect = NV_OPTIONAL_BOOL_DEFAULT;
     op->install_libglvnd_libraries = NV_OPTIONAL_BOOL_DEFAULT;
@@ -452,6 +453,9 @@ static void parse_commandline(int argc, char *argv[], Options *op)
         case NO_DRM_OPTION:
             op->install_drm = FALSE;
         break;
+        case NO_PEERMEM_OPTION:
+            op->install_peermem = FALSE;
+        break;
         case NO_CHECK_FOR_ALTERNATE_INSTALLS_OPTION:
             op->check_for_alternate_installs = FALSE;
         break;
diff --git a/nvidia-installer.h b/nvidia-installer.h
index 17be13e..7b8242f 100644
--- a/nvidia-installer.h
+++ b/nvidia-installer.h
@@ -215,6 +215,7 @@ typedef struct __options {
     int check_for_alternate_installs;
     int install_uvm;
     int install_drm;
+    int install_peermem;
     int compat32_files_packaged;
     int x_files_packaged;
     int concurrency_level;
diff --git a/option_table.h b/option_table.h
index 6e62554..6c24879 100644
--- a/option_table.h
+++ b/option_table.h
@@ -98,6 +98,7 @@ enum {
     NO_CHECK_FOR_ALTERNATE_INSTALLS_OPTION,
     NO_UVM_OPTION,
     NO_DRM_OPTION,
+    NO_PEERMEM_OPTION,
     INSTALL_COMPAT32_LIBS_OPTION,
     X_SYSCONFIG_PATH_OPTION,
     FORCE_LIBGLX_INDIRECT,
@@ -604,6 +605,12 @@ static const NVGetoptOption __options[] = {
       "should only be used to work around failures to build or install the "
       "nvidia-drm kernel module on systems that do not need these features." },
 
+    { "no-peermem", NO_PEERMEM_OPTION, 0, NULL,
+      "Do not install the nvidia-peermem kernel module. This kernel module "
+      "provides support for peer-to-peer memory sharing with Mellanox HCAs "
+      "(Host Channel Adapters) via GPUDirect RDMA (Remote Direct Memory "
+      "Access)." },
+
     { "concurrency-level", 'j', NVGETOPT_INTEGER_ARGUMENT, NULL,
       "Set the concurrency level for operations such as building the kernel "
       "module which may be parallelized on SMP systems. By default, this will "
diff --git a/version.mk b/version.mk
index 898711a..cdf641f 100644
--- a/version.mk
+++ b/version.mk
@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 470.82.00
+NVIDIA_VERSION = 470.86
 
 # This file.
 VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
-- 
cgit v1.2.3