superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau/pmu/gm200-: explicitly handle nofw 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
pull/496/merge
Ben Skeggs 2020-06-16 15:26:20 +10:00
parent 46fc98bfb8
commit 38fd546beb
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm200.c
View File

@ -30,9 +30,17 @@ gm200_pmu = {
.reset = gf100_pmu_reset,
};
int
gm200_pmu_nofw(struct nvkm_pmu *pmu, int ver, const struct nvkm_pmu_fwif *fwif)
{
nvkm_warn(&pmu->subdev, "firmware unavailable\n");
return 0;
}
static const struct nvkm_pmu_fwif
gm200_pmu_fwif[] = {
{ -1, gf100_pmu_nofw, &gm200_pmu },
{ -1, gm200_pmu_nofw, &gm200_pmu },
{}
};

3
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c
View File

@ -234,7 +234,8 @@ gm20b_pmu_load(struct nvkm_pmu *pmu, int ver, const struct nvkm_pmu_fwif *fwif)
static const struct nvkm_pmu_fwif
gm20b_pmu_fwif[] = {
{ 0, gm20b_pmu_load, &gm20b_pmu, &gm20b_pmu_acr },
{ 0, gm20b_pmu_load, &gm20b_pmu, &gm20b_pmu_acr },
{ -1, gm200_pmu_nofw, &gm20b_pmu },
{}
};

2
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c
View File

@ -46,7 +46,7 @@ gp102_pmu = {
static const struct nvkm_pmu_fwif
gp102_pmu_fwif[] = {
{ -1, gf100_pmu_nofw, &gp102_pmu },
{ -1, gm200_pmu_nofw, &gp102_pmu },
{}
};

3
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c
View File

@ -93,7 +93,8 @@ MODULE_FIRMWARE("nvidia/gp10b/pmu/sig.bin");
static const struct nvkm_pmu_fwif
gp10b_pmu_fwif[] = {
{ 0, gm20b_pmu_load, &gp10b_pmu, &gp10b_pmu_acr },
{ 0, gm20b_pmu_load, &gp10b_pmu, &gp10b_pmu_acr },
{ -1, gm200_pmu_nofw, &gp10b_pmu },
{}
};

1
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h
View File

@ -59,6 +59,7 @@ struct nvkm_pmu_fwif {
};
int gf100_pmu_nofw(struct nvkm_pmu *, int, const struct nvkm_pmu_fwif *);
int gm200_pmu_nofw(struct nvkm_pmu *, int, const struct nvkm_pmu_fwif *);
int gm20b_pmu_load(struct nvkm_pmu *, int, const struct nvkm_pmu_fwif *);
int nvkm_pmu_ctor(const struct nvkm_pmu_fwif *, struct nvkm_device *,