diff --git a/nvidiactl/nvidiactl b/nvidiactl/nvidiactl
index 4d69a6df..7944b088 100755
--- a/nvidiactl/nvidiactl
+++ b/nvidiactl/nvidiactl
@@ -65,7 +65,17 @@ test -e /lib/modules/$kver/kernel/drivers/gpu/drm/drm.ko && modprobe drm
 test -e /lib/modules/$kver/kernel/drivers/gpu/drm/drm_kms_helper.ko && modprobe drm_kms_helper
 test -e /lib/modules/$kver/kernel/drivers/gpu/drm/drm_ttm_helper.ko && modprobe drm_ttm_helper
 
-insmod ${nvlink}/nvidia.ko
+nvargs=""
+if /usr/sbin/hostconfig nvidia-no-gsp 2>/dev/null ; then
+  if modinfo -p ${nvlink}/nvidia.ko 2>/dev/null | grep -q NVreg_EnableGpuFirmware ; then
+    echo >&2 "NOTE: tag 'nvidia-no-gsp' set, disabling GSP firmware and run resource manager on CPU"
+    nvargs="NVreg_EnableGpuFirmware=0"
+  else
+    echo >&2 "NOTE: tag 'nvidia-no-gsp' set, but driver has no NVreg_EnableGpuFirmware parameter, ignoring.."
+  fi
+fi
+
+insmod ${nvlink}/nvidia.ko ${nvargs}
 
 # Count the number of NVIDIA controllers found.
 NVDEVS=$(lspci | grep -i NVIDIA)