iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/nouveau/bar/tu102-: prepare for GSP-RM

Browse Source 
- (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
This commit is contained in:
Ben Skeggs 2023-09-19 06:21:11 +10:00 committed by Dave Airlie
parent 74e2011b11
commit 45655ff084
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c
View File

@ -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);
}

4
drivers/gpu/drm/nouveau/nvkm/subdev/bar/tu102.c
View File

@ -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);
}