diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2023-09-19 06:21:10 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-10-31 15:08:10 +1000 |
| commit | 74e2011b11e0427908ff4e6a106f9ab96641cdd8 (patch) | |
| tree | c76e9e9b9169e445dcdeb8bda69de5edc25813cd | |
| parent | 015ef6187f69eca7d9029e3f8e358a86041e403a (diff) | |
| download | linux-stable-74e2011b11e0427908ff4e6a106f9ab96641cdd8.tar.gz linux-stable-74e2011b11e0427908ff4e6a106f9ab96641cdd8.tar.bz2 linux-stable-74e2011b11e0427908ff4e6a106f9ab96641cdd8.zip | |
drm/nouveau/acr/tu102-: prepare for GSP-RM
- disable ACR completely when GSP-RM detected
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-6-skeggsb@gmail.com
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga102.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/acr/tu102.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga102.c index 45dcf493e972..c7d38609bb7e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga102.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga102.c @@ -20,6 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ #include "priv.h" +#include <subdev/gsp.h> #include <nvfw/acr.h> @@ -322,5 +323,8 @@ int ga102_acr_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_acr **pacr) { + if (nvkm_gsp_rm(device->gsp)) + return -ENODEV; + return nvkm_acr_new_(ga102_acr_fwif, device, type, inst, pacr); } diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/tu102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/tu102.c index c22d551c0078..565e9a070b23 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/tu102.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/tu102.c @@ -201,5 +201,8 @@ int tu102_acr_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_acr **pacr) { + if (nvkm_gsp_rm(device->gsp)) + return -ENODEV; + return nvkm_acr_new_(tu102_acr_fwif, device, type, inst, pacr); } |