diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2023-09-18 23:21:11 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-10-31 08:08:10 +0300 |
| commit | 45655ff0848040f09e4a4f812fe4aa79e1363624 (patch) | |
| tree | 72f361f673aace986a2aa38f95fba5a1d879853b | |
| parent | 74e2011b11e0427908ff4e6a106f9ab96641cdd8 (diff) | |
| download | linux-45655ff0848040f09e4a4f812fe4aa79e1363624.tar.xz | |
drm/nouveau/bar/tu102-: prepare for GSP-RM
- (temporarily) disable if GSP-RM detected, will be added later
- move BAR2 teardown from dtor(), it doesn't belong there
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-7-skeggsb@gmail.com
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c | 10 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/bar/tu102.c | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c index d017a1b5e5dd..91bc53be97ff 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c @@ -93,8 +93,16 @@ static int nvkm_bar_fini(struct nvkm_subdev *subdev, bool suspend) { struct nvkm_bar *bar = nvkm_bar(subdev); + + if (!subdev->use.enabled) + return 0; + if (bar->func->bar1.fini) bar->func->bar1.fini(bar); + + if (!suspend) /* Handled by instmem. */ + nvkm_bar_bar2_fini(subdev->device); + return 0; } @@ -120,7 +128,7 @@ static void * nvkm_bar_dtor(struct nvkm_subdev *subdev) { struct nvkm_bar *bar = nvkm_bar(subdev); - nvkm_bar_bar2_fini(subdev->device); + return bar->func->dtor(bar); } diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/tu102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/tu102.c index c25ab407b85d..8041bb632835 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/tu102.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/tu102.c @@ -22,6 +22,7 @@ #include "gf100.h" #include <core/memory.h> +#include <subdev/gsp.h> #include <subdev/timer.h> static void @@ -95,5 +96,8 @@ int tu102_bar_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_bar **pbar) { + if (nvkm_gsp_rm(device->gsp)) + return -ENODEV; + return gf100_bar_new_(&tu102_bar, device, type, inst, pbar); } |