From 9255df8f595341ef6f18b95dfab801ed4dfb2d13 Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Mon, 27 Feb 2023 13:25:23 +0100
Subject: [PATCH] Revert "Set module parameter gpu_recovery=1 for amdgpu"
---
install.sh | 2 --
.../modprobe.d/amdgpu_gpu_recovery.conf | 18 ------------------
2 files changed, 20 deletions(-)
delete mode 100644 misc_etc_files/modprobe.d/amdgpu_gpu_recovery.conf
diff --git a/install.sh b/install.sh
index 14d4f19..17e909b 100755
--- a/install.sh
+++ b/install.sh
@@ -264,8 +264,6 @@ for f in libexec_startup/*; do
done
install_data misc_etc_files/request-key.d/id_resolver.conf \
"$DESTDIR$sysconfdir/request-key.d/id_resolver.conf"
-install_data misc_etc_files/modprobe.d/amdgpu_gpu_recovery.conf \
- "$DESTDIR$sysconfdir/modprobe.d/amdgpu_gpu_recovery.conf"
postinstall
exit
diff --git a/misc_etc_files/modprobe.d/amdgpu_gpu_recovery.conf b/misc_etc_files/modprobe.d/amdgpu_gpu_recovery.conf
deleted file mode 100644
index 424e2c2..0000000
--- a/misc_etc_files/modprobe.d/amdgpu_gpu_recovery.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Sometimes we have this on "fenchurch":
-#
-# kernel: [drm:amdgpu_job_timedout [amdgpu]] *ERROR* ring gfx timeout, signaled seq=16634335, emitted seq=16634337
-# kernel: [drm:amdgpu_job_timedout [amdgpu]] *ERROR* Process information: process Xorg pid 718 thread Xorg:cs0 pid 719
-# kernel: amdgpu 0000:01:00.0: amdgpu: GPU recovery disabled.
-#
-# From drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c:
-#
-# **
-# * DOC: gpu_recovery (int)
-# * Set to enable GPU recovery mechanism (1 = enable, 0 = disable). The default is -1 (auto, disabled except SRIOV).
-# */
-# MODULE_PARM_DESC(gpu_recovery, "Enable GPU recovery mechanism, (2 = advanced tdr mode, 1 = enable, 0 = disable, -1 = auto)");
-# module_param_named(gpu_recovery, amdgpu_gpu_recovery, int, 0444);
-#
-# So give it a try
-
-options amdgpu gpu_recovery=1