diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2023-09-19 06:21:14 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2023-10-31 15:08:11 +1000 |
commit | a613e7f3fe6d4be5e19429f28c21178ca74c3b56 (patch) | |
tree | 2ae15dbf4a1288c4cb873844ff49d3276a264210 /drivers/gpu | |
parent | 15740541e8f0b2b966e718fa6d384b1818ebe555 (diff) | |
download | linux-stable-a613e7f3fe6d4be5e19429f28c21178ca74c3b56.tar.gz linux-stable-a613e7f3fe6d4be5e19429f28c21178ca74c3b56.tar.bz2 linux-stable-a613e7f3fe6d4be5e19429f28c21178ca74c3b56.zip |
drm/nouveau/fault/tu102-: prepare for GSP-RM
- disable FAULT completely when GSP-RM detected
- SVM support will be disabled when running on RM because of this
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230918202149.4343-10-skeggsb@gmail.com
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/fault/tu102.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fault/tu102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fault/tu102.c index 967efaddae28..5390417a58b5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fault/tu102.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fault/tu102.c @@ -22,6 +22,7 @@ #include "priv.h" #include <core/memory.h> +#include <subdev/gsp.h> #include <subdev/mc.h> #include <subdev/mmu.h> #include <subdev/vfn.h> @@ -175,7 +176,12 @@ int tu102_fault_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_fault **pfault) { - int ret = nvkm_fault_new_(&tu102_fault, device, type, inst, pfault); + int ret; + + if (nvkm_gsp_rm(device->gsp)) + return -ENODEV; + + ret = nvkm_fault_new_(&tu102_fault, device, type, inst, pfault); if (ret) return ret; |