diff options
| author | Karol Herbst <karolherbst@gmail.com> | 2018-07-14 12:52:08 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2018-07-16 18:06:29 +1000 |
| commit | f706037c4e135d322160e201872ee3567435035a (patch) | |
| tree | 5a53eb47081494b9ed7c194640591e825af903a8 /drivers/gpu/drm/nouveau | |
| parent | 2ae4c5f6ff7310e4dcaca4378ddadd881d176693 (diff) | |
| download | blackbird-obmc-linux-f706037c4e135d322160e201872ee3567435035a.tar.gz blackbird-obmc-linux-f706037c4e135d322160e201872ee3567435035a.zip | |
drm/nouveau/bios/vpstate: There are some fermi vbios with no boost or tdp entry
If the entry size is too small, default to invalid values for both
boost_id and tdp_id, so as to default to the base clock in both cases.
Signed-off-by: Karol Herbst <karolherbst@gmail.com>
Signed-off-by: Martin Peres <martin.peres@free.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/bios/vpstate.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/vpstate.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/vpstate.c index 20b6fc8243e0..71524548de32 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/vpstate.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/vpstate.c @@ -58,8 +58,14 @@ nvbios_vpstate_parse(struct nvkm_bios *b, struct nvbios_vpstate_header *h) h->ecount = nvbios_rd08(b, h->offset + 0x5); h->base_id = nvbios_rd08(b, h->offset + 0x0f); - h->boost_id = nvbios_rd08(b, h->offset + 0x10); - h->tdp_id = nvbios_rd08(b, h->offset + 0x11); + if (h->hlen > 0x10) + h->boost_id = nvbios_rd08(b, h->offset + 0x10); + else + h->boost_id = 0xff; + if (h->hlen > 0x11) + h->tdp_id = nvbios_rd08(b, h->offset + 0x11); + else + h->tdp_id = 0xff; return 0; default: return -EINVAL; |
