From 1394ebdd37f0290d6ec080a334c60bc308b2cfab Mon Sep 17 00:00:00 2001 From: Adam Madsen Date: Tue, 10 Nov 2020 11:10:48 -0600 Subject: [PATCH] Do not reset when device is under control of amdgpu. --- dkms.conf | 2 +- src/amd/common.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dkms.conf b/dkms.conf index 31b184e..26bb826 100644 --- a/dkms.conf +++ b/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="vendor-reset" -PACKAGE_VERSION="0.0.2" +PACKAGE_VERSION="0.0.3" BUILT_MODULE_NAME[0]="${PACKAGE_NAME}" MAKE[0]="make KDIR=${kernel_source_dir}" CLEAN="make KDIR=${kernel_source_dir} clean" diff --git a/src/amd/common.c b/src/amd/common.c index c1a46aa..b7e935d 100644 --- a/src/amd/common.c +++ b/src/amd/common.c @@ -36,6 +36,10 @@ int amd_common_pre_reset(struct vendor_reset_dev *dev) /* disable bus reset for the card, seems to be an issue with all of em */ pdev->dev_flags |= PCI_DEV_FLAGS_NO_BUS_RESET; + /* do not try to reset the card under amdgpu, it will cause problems */ + if (pdev->dev.driver && strcmp(pdev->dev.driver->name, "amdgpu")) + return -ENOTTY; + priv = kzalloc(sizeof *priv, GFP_KERNEL); if (!priv) return -ENOMEM;